Added test for preemptible and GPU instances

refractor for onHost constant values

Author: miyadav

pkg/capi/gcp.go

@@ -20,8 +20,10 @@ import (
 )
 
 const (
-	infraAPIVersion        = "infrastructure.cluster.x-k8s.io/v1beta1"
-	gcpMachineTemplateName = "gcp-machine-template"
+	infraAPIVersion            = "infrastructure.cluster.x-k8s.io/v1beta1"
+	gcpMachineTemplateName     = "gcp-machine-template"
+	OnHostMaintenanceTerminate = "Terminate"
+	OnHostMaintenanceMigrate   = "Migrate"
 )
 
 var (
@@ -77,7 +79,9 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 			Expect(mapiProviderSpec).ToNot(BeNil())
 			gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
 			gcpMachineTemplate.Spec.Template.Spec.RootDeviceType = &expectedDiskType
-			*gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = gcpv1.HostMaintenancePolicyTerminate
+			mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
+			gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
+
 			if err := cl.Create(ctx, gcpMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
 				Expect(err).ToNot(HaveOccurred())
 			}
@@ -107,7 +111,8 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 			mapiProviderSpec := getGCPMAPIProviderSpec(cl)
 			Expect(mapiProviderSpec).ToNot(BeNil())
 			gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
-			*gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = gcpv1.HostMaintenancePolicyMigrate
+			mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceMigrate
+			gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
 			gcpMachineTemplate.Spec.Template.Spec.ShieldedInstanceConfig = &gcpv1.GCPShieldedInstanceConfig{
 				SecureBoot:                       enableSecureBoot,
 				VirtualizedTrustedPlatformModule: enableVtpm,
@@ -167,7 +172,7 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 			gcpMachineTemplate.Spec.Template.Spec.InstanceType = "n2d-standard-4"
 
 			if *confidentialCompute == gcpv1.ConfidentialComputePolicyEnabled {
-				mapiProviderSpec.OnHostMaintenance = "Terminate"
+				mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
 				gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
 			} else {
 				mapiProviderSpec.OnHostMaintenance = "Migrate"
@@ -206,6 +211,86 @@ var _ = Describe("Cluster API GCP MachineSet", framework.LabelCAPI, framework.La
 		Entry("Confidential Compute enabled", &confidentialComputeEnabled),
 		Entry("Confidential Compute disabled", &confidentialComputeDisabled),
 	)
+	// OCP-74732 GPU machine can be provisioned successfully by capi machineset
+	// author: [email protected]
+	It("should provision GPU machine successfully", func() {
+		mapiProviderSpec := getGCPMAPIProviderSpec(cl)
+		Expect(mapiProviderSpec).ToNot(BeNil())
+		gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
+		gcpMachineTemplate.Spec.Template.Spec.InstanceType = "a2-highgpu-1g"
+		mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
+		gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
+
+		if err := cl.Create(ctx, gcpMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
+			Expect(err).ToNot(HaveOccurred())
+		}
+
+		By("Creating a MachineSet for GPU machine")
+		machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, framework.NewCAPIMachineSetParams(
+			"gcp-machineset-gpu-74732",
+			clusterName,
+			mapiProviderSpec.Zone,
+			1,
+			corev1.ObjectReference{
+				Kind:       "GCPMachineTemplate",
+				APIVersion: infraAPIVersion,
+				Name:       gcpMachineTemplateName,
+			},
+		))
+		Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI MachineSet with GPU instanceType")
+
+		framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name)
+
+		By("Verifying the GPU machinetype configuration on the created GCP MachineTemplate")
+		createdTemplate := &gcpv1.GCPMachineTemplate{}
+		Expect(cl.Get(framework.GetContext(), client.ObjectKey{
+			Namespace: framework.ClusterAPINamespace,
+			Name:      gcpMachineTemplateName,
+		}, createdTemplate)).To(Succeed())
+		var machineType = createdTemplate.Spec.Template.Spec.InstanceType
+		Expect(machineType).To(Equal("a2-highgpu-1g"))
+	},
+	)
+	// OCP-75792 Preemptible machines can be provisioned successfully by capi machineset
+	// author: [email protected]
+	It("should provision Preemptible machine successfully", func() {
+		mapiProviderSpec := getGCPMAPIProviderSpec(cl)
+		Expect(mapiProviderSpec).ToNot(BeNil())
+		gcpMachineTemplate = createGCPMachineTemplate(mapiProviderSpec)
+		gcpMachineTemplate.Spec.Template.Spec.Preemptible = true
+		mapiProviderSpec.OnHostMaintenance = OnHostMaintenanceTerminate
+		gcpMachineTemplate.Spec.Template.Spec.OnHostMaintenance = (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance)
+
+		if err := cl.Create(ctx, gcpMachineTemplate); err != nil && !apierrors.IsAlreadyExists(err) {
+			Expect(err).ToNot(HaveOccurred())
+		}
+
+		By("Creating a MachineSet for preeemptible machine")
+		machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, framework.NewCAPIMachineSetParams(
+			"gcp-machineset-preemptible-75792",
+			clusterName,
+			mapiProviderSpec.Zone,
+			1,
+			corev1.ObjectReference{
+				Kind:       "GCPMachineTemplate",
+				APIVersion: infraAPIVersion,
+				Name:       gcpMachineTemplateName,
+			},
+		))
+		Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI MachineSet with preemptible instanceType")
+
+		framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name)
+
+		By("Verifying the preemptible machinetype configuration on the created GCP MachineTemplate")
+		createdTemplate := &gcpv1.GCPMachineTemplate{}
+		Expect(cl.Get(framework.GetContext(), client.ObjectKey{
+			Namespace: framework.ClusterAPINamespace,
+			Name:      gcpMachineTemplateName,
+		}, createdTemplate)).To(Succeed())
+		var preemptible = createdTemplate.Spec.Template.Spec.Preemptible
+		Expect(preemptible).To(Equal(true))
+	})
+
 })
 
 func getGCPMAPIProviderSpec(cl client.Client) *mapiv1.GCPMachineProviderSpec {
@@ -246,11 +331,10 @@ func createGCPMachineTemplate(mapiProviderSpec *mapiv1.GCPMachineProviderSpec) *
 	ipForwardingDisabled := gcpv1.IPForwardingDisabled
 
 	gcpMachineSpec := gcpv1.GCPMachineSpec{
-		RootDeviceSize:    mapiProviderSpec.Disks[0].SizeGB,
-		InstanceType:      mapiProviderSpec.MachineType,
-		OnHostMaintenance: (*gcpv1.HostMaintenancePolicy)(&mapiProviderSpec.OnHostMaintenance),
-		Image:             &mapiProviderSpec.Disks[0].Image,
-		Subnet:            &mapiProviderSpec.NetworkInterfaces[0].Subnetwork,
+		RootDeviceSize: mapiProviderSpec.Disks[0].SizeGB,
+		InstanceType:   mapiProviderSpec.MachineType,
+		Image:          &mapiProviderSpec.Disks[0].Image,
+		Subnet:         &mapiProviderSpec.NetworkInterfaces[0].Subnetwork,
 		ServiceAccount: &gcpv1.ServiceAccount{
 			Email:  mapiProviderSpec.ServiceAccounts[0].Email,
 			Scopes: mapiProviderSpec.ServiceAccounts[0].Scopes,