azure: only build and run Hyper-V Gen2 images

Remove the option to specify the Hyper-V Generation during image
creation and when running instances through kola. Instead, only
build traditional and gallery images using Hyper-V Gen2.

Author: marmijo

mantle/cmd/kola/kola.go

@@ -308,7 +308,6 @@ func writeProps() error {
 		Location         string `json:"location"`
 		Size             string `json:"size"`
 		AvailabilityZone string `json:"availability_zone"`
-		HyperVGeneration string `json:"hyper_v_generation"`
 	}
 	type DO struct {
 		Region string `json:"region"`
@@ -365,7 +364,6 @@ func writeProps() error {
 			Location:         kola.AzureOptions.Location,
 			Size:             kola.AzureOptions.Size,
 			AvailabilityZone: kola.AzureOptions.AvailabilityZone,
-			HyperVGeneration: kola.AzureOptions.HyperVGeneration,
 		},
 		DO: DO{
 			Region: kola.DOOptions.Region,

mantle/cmd/kola/options.go

@@ -101,7 +101,6 @@ func init() {
 	sv(&kola.AzureOptions.Location, "azure-location", "westus", "Azure location (default \"westus\"")
 	sv(&kola.AzureOptions.Size, "azure-size", "Standard_D2_v2", "Azure machine size (default \"Standard_D2_v2\")")
 	sv(&kola.AzureOptions.AvailabilityZone, "azure-availability-zone", "1", "Azure Availability Zone (default \"1\")")
-	sv(&kola.AzureOptions.HyperVGeneration, "azure-hyper-v-generation", "V1", "Azure Hyper-V Generation (default \"V1\")")
 
 	// do-specific options
 	sv(&kola.DOOptions.ConfigPath, "do-config-file", "", "DigitalOcean config file (default \"~/"+auth.DOConfigPath+"\")")

mantle/cmd/ore/azure/azure.go

@@ -34,7 +34,6 @@ var (
 
 	azureCredentials string
 	azureLocation    string
-	azureHyperVGen   string
 	azurePublisher   string
 
 	api *azure.API
@@ -46,7 +45,6 @@ func init() {
 	sv := Azure.PersistentFlags().StringVar
 	sv(&azureCredentials, "azure-credentials", "", "Azure credentials file location (default \"~/"+auth.AzureCredentialsPath+"\")")
 	sv(&azureLocation, "azure-location", "westus", "Azure location (default \"westus\")")
-	sv(&azureHyperVGen, "azure-hyper-v-generation", "V1", "Azure Hypervisor Generation")
 	sv(&azurePublisher, "azure-publisher", "CoreOS", "Azure image publisher")
 }
 
@@ -56,7 +54,6 @@ func preauth(cmd *cobra.Command, args []string) error {
 	a, err := azure.New(&azure.Options{
 		AzureCredentials: azureCredentials,
 		Location:         azureLocation,
-		HyperVGeneration: azureHyperVGen,
 		Publisher:        azurePublisher,
 	})
 	if err != nil {

mantle/platform/api/azure/gallery.go

@@ -18,7 +18,6 @@ package azure
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
@@ -48,16 +47,11 @@ func (a *API) CreateGalleryImage(name, galleryName, resourceGroup, sourceImageID
 
 	// enable NVMe support for Gen2 images only. NVMe support is not available on Gen1 images.
 	// DiskControllerTypes is set to SCSI by default for Gen1 images.
-	var galleryImageFeatures []*armcompute.GalleryImageFeature
-	if strings.EqualFold(a.opts.HyperVGeneration, string(armcompute.HyperVGenerationV2)) {
-		galleryImageFeatures = []*armcompute.GalleryImageFeature{
-			{
-				Name:  to.Ptr("DiskControllerTypes"),
-				Value: to.Ptr("SCSI,NVMe"),
-			},
-		}
-	} else {
-		galleryImageFeatures = nil
+	galleryImageFeatures := []*armcompute.GalleryImageFeature{
+		{
+			Name:  to.Ptr("DiskControllerTypes"),
+			Value: to.Ptr("SCSI,NVMe"),
+		},
 	}
 
 	// Create a Gallery Image Definition with the specified Hyper-V generation (V1 or V2).
@@ -66,7 +60,7 @@ func (a *API) CreateGalleryImage(name, galleryName, resourceGroup, sourceImageID
 		Properties: &armcompute.GalleryImageProperties{
 			OSState:          to.Ptr(armcompute.OperatingSystemStateTypesGeneralized),
 			OSType:           to.Ptr(armcompute.OperatingSystemTypesLinux),
-			HyperVGeneration: to.Ptr(armcompute.HyperVGeneration(a.opts.HyperVGeneration)),
+			HyperVGeneration: to.Ptr(armcompute.HyperVGeneration(armcompute.HyperVGenerationV2)),
 			Identifier: &armcompute.GalleryImageIdentifier{
 				Publisher: &a.opts.Publisher,
 				Offer:     to.Ptr(name),

mantle/platform/api/azure/image.go

@@ -28,7 +28,7 @@ func (a *API) CreateImage(name, resourceGroup, blobURI string) (armcompute.Image
 		Name:     &name,
 		Location: &a.opts.Location,
 		Properties: &armcompute.ImageProperties{
-			HyperVGeneration: to.Ptr(armcompute.HyperVGenerationTypes(a.opts.HyperVGeneration)),
+			HyperVGeneration: to.Ptr(armcompute.HyperVGenerationTypes(armcompute.HyperVGenerationTypesV2)),
 			StorageProfile: &armcompute.ImageStorageProfile{
 				OSDisk: &armcompute.ImageOSDisk{
 					OSType:  to.Ptr(armcompute.OperatingSystemTypesLinux),

mantle/platform/api/azure/instance.go

@@ -24,7 +24,6 @@ import (
 	"math"
 	"math/big"
 	"regexp"
-	"strings"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
@@ -108,13 +107,8 @@ func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI, size st
 		}
 	}
 	// UltraSSDEnabled=true is required for NVMe support on Gen2 VMs
-	var additionalCapabilities *armcompute.AdditionalCapabilities
-	if strings.EqualFold(a.opts.HyperVGeneration, string(armcompute.HyperVGenerationV2)) {
-		additionalCapabilities = &armcompute.AdditionalCapabilities{
-			UltraSSDEnabled: to.Ptr(true),
-		}
-	} else {
-		additionalCapabilities = nil
+	additionalCapabilities := &armcompute.AdditionalCapabilities{
+		UltraSSDEnabled: to.Ptr(true),
 	}
 	return armcompute.VirtualMachine{
 		Name:     &name,

mantle/platform/api/azure/network.go

@@ -18,10 +18,8 @@ package azure
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
-	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork"
 
 	"github.com/coreos/coreos-assembler/mantle/util"
@@ -91,25 +89,13 @@ func (a *API) createPublicIP(resourceGroup string) (armnetwork.PublicIPAddress,
 	var ipZones []*string
 
 	// set SKU=Standard, Allocation Method=Static and Availability Zone on public IPs when creating Gen2 images
-	if strings.EqualFold(a.opts.HyperVGeneration, string(armcompute.HyperVGenerationV2)) {
-		ipSKU = &armnetwork.PublicIPAddressSKU{
-			Name: to.Ptr(armnetwork.PublicIPAddressSKUNameStandard),
-		}
-		ipProperties = &armnetwork.PublicIPAddressPropertiesFormat{
-			PublicIPAllocationMethod: to.Ptr(armnetwork.IPAllocationMethodStatic),
-		}
-		ipZones = []*string{to.Ptr(a.opts.AvailabilityZone)}
-		// gen 1
-	} else {
-		ipSKU = &armnetwork.PublicIPAddressSKU{
-			Name: to.Ptr(armnetwork.PublicIPAddressSKUNameBasic),
-		}
-		ipProperties = &armnetwork.PublicIPAddressPropertiesFormat{
-			PublicIPAllocationMethod: to.Ptr(armnetwork.IPAllocationMethodDynamic),
-		}
-		// No Zones for Gen1
-		ipZones = nil
+	ipSKU = &armnetwork.PublicIPAddressSKU{
+		Name: to.Ptr(armnetwork.PublicIPAddressSKUNameStandard),
+	}
+	ipProperties = &armnetwork.PublicIPAddressPropertiesFormat{
+		PublicIPAllocationMethod: to.Ptr(armnetwork.IPAllocationMethodStatic),
 	}
+	ipZones = []*string{to.Ptr(a.opts.AvailabilityZone)}
 
 	poller, err := a.ipClient.BeginCreateOrUpdate(ctx, resourceGroup, name, armnetwork.PublicIPAddress{
 		Location:   to.Ptr(a.opts.Location),

mantle/platform/api/azure/options.go

@@ -33,7 +33,6 @@ type Options struct {
 	Size             string
 	Location         string
 	AvailabilityZone string
-	HyperVGeneration string
 
 	SubscriptionName string
 	SubscriptionID   string