Remove CSI Insecure

kubernetes-sigs · Jul 5, 2024 · 9efb2ac · 9efb2ac
1 parent c4a552d
commit 9efb2ac
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 65 deletions.
diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml
@@ -253,7 +253,6 @@ variables:
   VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
   VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
   FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
-  VSPHERE_INSECURE_CSI: "true"
   KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
   NODE_DRAIN_TIMEOUT: "60s"
   CLUSTER_TOPOLOGY: "true"

diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
 patches:
   # We are dropping storage policy so we also have test coverage
   # for normal provisioning via data stores.

diff --git a/...e/data/infrastructure-vsphere-govmomi/main/commons/cluster-resource-set-csi-insecure.yaml b/...e/data/infrastructure-vsphere-govmomi/main/commons/cluster-resource-set-csi-insecure.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/ignition/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/ignition/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
   - flatcar.yaml
 patches:
   # We are dropping storage policy so we also have test coverage

diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/ownerrefs-finalizers/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/ownerrefs-finalizers/kustomization.yaml
@@ -7,6 +7,5 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
   - vsphereclusteridentity.yaml
   - drop-existing-identity-secret.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/topology/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/topology/kustomization.yaml
@@ -6,4 +6,3 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
diff --git a/.../data/infrastructure-vsphere-govmomi/v1.10/commons/cluster-resource-set-csi-insecure.yaml b/.../data/infrastructure-vsphere-govmomi/v1.10/commons/cluster-resource-set-csi-insecure.yaml
@@ -15,7 +15,7 @@ stringData:
         [Global]
 
         [VirtualCenter "${VSPHERE_SERVER}"]
-        insecure-flag = "${VSPHERE_INSECURE_CSI}"
+        insecure-flag = "true"
         user = "${VSPHERE_USERNAME}"
         password = "${VSPHERE_PASSWORD}"
         datacenters = "${VSPHERE_DATACENTER}"

diff --git a/...e/data/infrastructure-vsphere-govmomi/v1.9/commons/cluster-resource-set-csi-insecure.yaml b/...e/data/infrastructure-vsphere-govmomi/v1.9/commons/cluster-resource-set-csi-insecure.yaml
@@ -15,7 +15,7 @@ stringData:
         [Global]
 
         [VirtualCenter "${VSPHERE_SERVER}"]
-        insecure-flag = "${VSPHERE_INSECURE_CSI}"
+        insecure-flag = "true"
         user = "${VSPHERE_USERNAME}"
         password = "${VSPHERE_PASSWORD}"
         datacenters = "${VSPHERE_DATACENTER}"

diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/kustomization.yaml
@@ -6,4 +6,3 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
diff --git a/...ata/infrastructure-vsphere-supervisor/main/commons/cluster-resource-set-csi-insecure.yaml b/...ata/infrastructure-vsphere-supervisor/main/commons/cluster-resource-set-csi-insecure.yaml
diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/topology/kustomization.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/topology/kustomization.yaml
@@ -6,4 +6,3 @@ resources:
 patchesStrategicMerge:
   - ../commons/cluster-resource-set-label.yaml
   - ../commons/cluster-network-CIDR.yaml
-  - ../commons/cluster-resource-set-csi-insecure.yaml
diff --git a/...ta/infrastructure-vsphere-supervisor/v1.10/commons/cluster-resource-set-csi-insecure.yaml b/...ta/infrastructure-vsphere-supervisor/v1.10/commons/cluster-resource-set-csi-insecure.yaml
@@ -15,7 +15,7 @@ stringData:
         [Global]
 
         [VirtualCenter "${VSPHERE_SERVER}"]
-        insecure-flag = "${VSPHERE_INSECURE_CSI}"
+        insecure-flag = "true"
         user = "${VSPHERE_USERNAME}"
         password = "${VSPHERE_PASSWORD}"
         datacenters = "${VSPHERE_DATACENTER}"

diff --git a/...ata/infrastructure-vsphere-supervisor/v1.9/commons/cluster-resource-set-csi-insecure.yaml b/...ata/infrastructure-vsphere-supervisor/v1.9/commons/cluster-resource-set-csi-insecure.yaml
@@ -15,7 +15,7 @@ stringData:
         [Global]
 
         [VirtualCenter "${VSPHERE_SERVER}"]
-        insecure-flag = "${VSPHERE_INSECURE_CSI}"
+        insecure-flag = "true"
         user = "${VSPHERE_USERNAME}"
         password = "${VSPHERE_PASSWORD}"
         datacenters = "${VSPHERE_DATACENTER}"