[release/v1.36] Fix wrong CPU config (#1203)

* enable vsphere e2e tests (#1079)

Signed-off-by: Moath Qasim <[email protected]>

* Fix wrong CPU config

Signed-off-by: Helene Durand <[email protected]>

* fixing the tests

Signed-off-by: Moath Qasim <[email protected]>

* exclude 1.17 & 1.18

Signed-off-by: Moath Qasim <[email protected]>

Co-authored-by: Moath Qasim <[email protected]>
Co-authored-by: Helene Durand <[email protected]>

Author: 3 people

.prow.yaml

@@ -545,7 +545,7 @@ presubmits:
               cpu: 500m
 
   - name: pull-machine-controller-e2e-vsphere
-    always_run: false
+    always_run: true
     decorate: true
     error_on_eviction: true
     clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
@@ -790,7 +790,7 @@ presubmits:
               cpu: 500m
 
   - name: pull-machine-controller-e2e-vsphere-resource-pool
-    always_run: false
+    always_run: true
     decorate: true
     error_on_eviction: true
     clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"

pkg/cloudprovider/provider/kubevirt/provider.go

@@ -363,9 +363,6 @@ func (p *provider) Create(machine *v1alpha1.Machine, _ *cloudprovidertypes.Provi
 				},
 				Spec: kubevirtv1.VirtualMachineInstanceSpec{
 					Domain: kubevirtv1.DomainSpec{
-						CPU: &kubevirtv1.CPU{
-							Cores: 2,
-						},
 						Devices: kubevirtv1.Devices{
 							Disks: []kubevirtv1.Disk{
 								{

test/e2e/provisioning/all_e2e_test.go

@@ -312,7 +312,7 @@ func TestKubevirtDNSConfigProvisioningE2E(t *testing.T) {
 		name:              "Kubevirt with dns config",
 		osName:            "ubuntu",
 		containerRuntime:  "docker",
-		kubernetesVersion: "v1.17.0",
+		kubernetesVersion: "v1.19.16",
 		executor:          verifyCreateAndDelete,
 	}
 
@@ -662,7 +662,7 @@ func TestHetznerProvisioningE2E(t *testing.T) {
 		t.Fatal("unable to run the test suite, HZ_E2E_TOKEN environment variable cannot be empty")
 	}
 
-	selector := OsSelector("ubuntu", "centos")
+	selector := OsSelector("ubuntu")
 
 	// act
 	params := []string{fmt.Sprintf("<< HETZNER_TOKEN >>=%s", hzToken)}
@@ -766,7 +766,7 @@ func getVSphereTestParams(t *testing.T) []string {
 func TestVsphereProvisioningE2E(t *testing.T) {
 	t.Parallel()
 
-	selector := Not(OsSelector("sles", "rhel", "amzn2"))
+	selector := Not(OsSelector("sles", "amzn2"))
 	params := getVSphereTestParams(t)
 
 	runScenarios(t, selector, params, VSPhereManifest, fmt.Sprintf("vs-%s", *testRunIdentifier))
@@ -794,7 +794,7 @@ func TestVsphereResourcePoolProvisioningE2E(t *testing.T) {
 		name:              "vSphere resource pool provisioning",
 		osName:            "flatcar",
 		containerRuntime:  "docker",
-		kubernetesVersion: "1.17.0",
+		kubernetesVersion: "1.19.16",
 		executor:          verifyCreateAndDelete,
 	}
 

test/e2e/provisioning/helper.go

@@ -33,10 +33,8 @@ var (
 	scenarios = buildScenarios()
 
 	versions = []*semver.Version{
-		semver.MustParse("v1.17.16"),
-		semver.MustParse("v1.18.14"),
-		semver.MustParse("v1.19.4"),
-		semver.MustParse("v1.20.1"),
+		semver.MustParse("v1.19.16"),
+		semver.MustParse("v1.20.15"),
 	}
 
 	operatingSystems = []providerconfigtypes.OperatingSystem{

test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml

@@ -31,11 +31,11 @@ spec:
             folder: '/dc-1/vm/e2e-tests'
             password: << VSPHERE_PASSWORD >>
             # example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
+            datastore: 'datastore1'
             cluster: '<< VSPHERE_CLUSTER >>'
-            datastoreCluster: 'dsc-1'
             resourcePool: 'e2e-resource-pool'
             cpus: 2
-            MemoryMB: 2048
+            MemoryMB: 4096
             diskSizeGB: << DISK_SIZE >>
             rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
           operatingSystem: "<< OS_NAME >>"

test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml

@@ -30,9 +30,8 @@ spec:
             datacenter: 'dc-1'
             folder: '/dc-1/vm/e2e-tests'
             password: << VSPHERE_PASSWORD >>
-            # example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
+            datastore: HS-FreeNAS
             cluster: '<< VSPHERE_CLUSTER >>'
-            datastore: exsi-nas
             cpus: 2
             MemoryMB: 2048
             diskSizeGB: << DISK_SIZE >>