test: add env var to allow setting CPI to insecure and use it in CI

kubernetes-sigs · Jul 24, 2024 · 90bcae1 · 90bcae1
1 parent 450ef20
commit 90bcae1
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 2 deletions.
diff --git a/packaging/flavorgen/flavors/crs/util.go b/packaging/flavorgen/flavors/crs/util.go
@@ -80,7 +80,10 @@ func newCPIConfig() ([]byte, error) {
 			"secretName":      "cloud-provider-vsphere-credentials",
 			"secretNamespace": metav1.NamespaceSystem,
 			"thumbprint":      env.VSphereThumbprint,
-			"port":            443,
+			// insecureFlag needs to be set to true in CI when using older CPI versions
+			// because old versions of CPI (<= v1.29.0) do not support SHA256 thumbprints.
+			"insecureFlag": env.VSphereInsecureCPI,
+			"port":         443,
 		},
 		"vcenter": map[string]interface{}{
 			env.VSphereServerVar: map[string]interface{}{

diff --git a/packaging/flavorgen/flavors/env/envsubts_consts.go b/packaging/flavorgen/flavors/env/envsubts_consts.go
@@ -36,6 +36,7 @@ const (
 	NodeIPAMPoolName             = "${NODE_IPAM_POOL_NAME}"
 	VSphereDataCenterVar         = "${VSPHERE_DATACENTER}"
 	VSphereThumbprint            = "${VSPHERE_TLS_THUMBPRINT}"
+	VSphereInsecureCPI           = "${VSPHERE_INSECURE_CPI:=false}"
 	VSphereDatastoreVar          = "${VSPHERE_DATASTORE}"
 	VSphereFolderVar             = "${VSPHERE_FOLDER}"
 	VSphereNetworkVar            = "${VSPHERE_NETWORK}"

diff --git a/packaging/flavorgen/flavors/util/helpers.go b/packaging/flavorgen/flavors/util/helpers.go
@@ -79,7 +79,6 @@ var (
 		regexVar(env.VSphereServerVar),
 		regexVar(env.VSphereTemplateVar),
 		regexVar(env.VSphereStoragePolicyVar),
-		// TODO: Why was thumbprint not here?
 		regexVar(env.VSphereThumbprint),
 	}
 )

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -1260,6 +1260,7 @@ data:
     data:
       vsphere.conf: |
         global:
+          insecureFlag: ${VSPHERE_INSECURE_CPI:=false}
           port: 443
           secretName: cloud-provider-vsphere-credentials
           secretNamespace: kube-system

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -1464,6 +1464,7 @@ data:
     data:
       vsphere.conf: |
         global:
+          insecureFlag: ${VSPHERE_INSECURE_CPI:=false}
           port: 443
           secretName: cloud-provider-vsphere-credentials
           secretNamespace: kube-system

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -1385,6 +1385,7 @@ data:
     data:
       vsphere.conf: |
         global:
+          insecureFlag: ${VSPHERE_INSECURE_CPI:=false}
           port: 443
           secretName: cloud-provider-vsphere-credentials
           secretNamespace: kube-system

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -1159,6 +1159,7 @@ data:
     data:
       vsphere.conf: |
         global:
+          insecureFlag: ${VSPHERE_INSECURE_CPI:=false}
           port: 443
           secretName: cloud-provider-vsphere-credentials
           secretNamespace: kube-system

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -1375,6 +1375,7 @@ data:
     data:
       vsphere.conf: |
         global:
+          insecureFlag: ${VSPHERE_INSECURE_CPI:=false}
           port: 443
           secretName: cloud-provider-vsphere-credentials
           secretNamespace: kube-system

diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -201,6 +201,7 @@ variables:
   VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.29.0"
   FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3602.2.3-kube-v1.29.0"
   VSPHERE_INSECURE_CSI: "true"
+  VSPHERE_INSECURE_CPI: "true"
   KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
   NODE_DRAIN_TIMEOUT: "60s"
   CLUSTER_TOPOLOGY: "true"

diff --git a/test/e2e/data/infrastructure-vsphere/v1.7/base/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere/v1.7/base/cluster-template-topology.yaml
@@ -292,6 +292,7 @@ stringData:
         user = "${VSPHERE_USERNAME}"
         password = "${VSPHERE_PASSWORD}"
         datacenters = "${VSPHERE_DATACENTER}"
+        insecureFlag = "${VSPHERE_INSECURE_CPI:=false}"
 
         [Network]
         public-network = "${VSPHERE_NETWORK}"

diff --git a/test/e2e/data/infrastructure-vsphere/v1.8/base/cluster-template-topology.yaml b/test/e2e/data/infrastructure-vsphere/v1.8/base/cluster-template-topology.yaml
@@ -798,6 +798,9 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
+            env:
+            - name: VSPHERE_INSECURE
+              value: ${VSPHERE_INSECURE_CPI:=false}
             resources:
               requests:
                 cpu: 200m