🌱 flavorgen: Bump CSI to v3.3.0 (#3088)

* flavorgen: Bump CSI to v3.3.0 * Remove CSI Insecure
kubernetes-sigs · Jul 5, 2024 · 075f9d0 · 075f9d0
1 parent 1d6d588
commit 075f9d0
Show file tree

Hide file tree

Showing 23 changed files with 210 additions and 317 deletions.
diff --git a/packaging/flavorgen/cloudprovider/csi/README.md b/packaging/flavorgen/cloudprovider/csi/README.md
@@ -0,0 +1,3 @@
+# CSI
+
+The manifest at `vsphere-csi-driver.yaml` is synced from `https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/${VERSION}/manifests/vanilla/vsphere-csi-driver.yaml`.
diff --git a/packaging/flavorgen/cloudprovider/csi/kustomization.yaml b/packaging/flavorgen/cloudprovider/csi/kustomization.yaml
@@ -4,13 +4,6 @@ namespace: vmware-system-csi
 resources:
   - namespace.yaml
   - vsphere-csi-driver.yaml
-images:
-  - name: gcr.io/cloud-provider-vsphere/csi/ci/driver
-    newName: gcr.io/cloud-provider-vsphere/csi/release/driver
-    newTag: v3.1.0
-  - name: gcr.io/cloud-provider-vsphere/csi/ci/syncer
-    newName: gcr.io/cloud-provider-vsphere/csi/release/syncer
-    newTag: v3.1.0
 patches:
 - patch: |-
     kind: Deployment

diff --git a/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml b/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml
@@ -148,21 +148,8 @@ roleRef:
 ---
 apiVersion: v1
 data:
-  "csi-migration": "true"
-  "csi-auth-check": "true"
-  "online-volume-extend": "true"
   "trigger-csi-fullsync": "false"
-  "async-query-volume": "true"
-  "block-volume-snapshot": "true"
-  "csi-windows-support": "true"
-  "list-volumes": "true"
   "pv-to-backingdiskobjectid-mapping": "false"
-  "cnsmgr-suspend-create-volume": "true"
-  "topology-preferential-datastores": "true"
-  "max-pvscsi-targets-per-vm": "true"
-  "multi-vcenter-csi-topology": "true"
-  "csi-internal-generated-cluster-id": "true"
-  "listview-tasks": "true"
 kind: ConfigMap
 metadata:
   name: internal-feature-states.csi.vsphere.vmware.com
@@ -220,9 +207,19 @@ spec:
                     values:
                       - vsphere-csi-controller
               topologyKey: "kubernetes.io/hostname"
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
+            - matchExpressions:
+              - key: node-role.kubernetes.io/controlplane
+                operator: Exists
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: Exists
       serviceAccountName: vsphere-csi-controller
-      nodeSelector:
-        node-role.kubernetes.io/control-plane: ""
       tolerations:
         - key: node-role.kubernetes.io/master
           operator: Exists
@@ -243,7 +240,7 @@ spec:
       dnsPolicy: "Default"
       containers:
         - name: csi-attacher
-          image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.5.1
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -261,7 +258,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-resizer
-          image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.10.1
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -280,7 +277,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: vsphere-csi-controller
-          image: gcr.io/cloud-provider-vsphere/csi/ci/driver:latest
+          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"
@@ -332,15 +329,15 @@ spec:
             periodSeconds: 180
             failureThreshold: 3
         - name: liveness-probe
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: vsphere-syncer
-          image: gcr.io/cloud-provider-vsphere/csi/ci/syncer:latest
+          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
           args:
             - "--leader-election"
             - "--leader-election-lease-duration=30s"
@@ -364,8 +361,6 @@ spec:
               value: "100"
             - name: INCLUSTER_CLIENT_BURST
               value: "100"
-            - name: GODEBUG
-              value: x509sha1=1
             - name: CSI_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -379,7 +374,7 @@ spec:
               name: vsphere-config-volume
               readOnly: true
         - name: csi-provisioner
-          image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+          image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
           args:
             - "--v=4"
             - "--timeout=300s"
@@ -401,7 +396,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-snapshotter
-          image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+          image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
           args:
             - "--v=4"
             - "--kube-api-qps=100"
@@ -452,7 +447,7 @@ spec:
       dnsPolicy: "ClusterFirstWithHostNet"
       containers:
         - name: node-driver-registrar
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -475,7 +470,7 @@ spec:
               - --mode=kubelet-registration-probe
             initialDelaySeconds: 3
         - name: vsphere-csi-node
-          image: gcr.io/cloud-provider-vsphere/csi/ci/driver:latest
+          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"
@@ -497,8 +492,6 @@ spec:
               value: "true"
             - name: LOGGER_LEVEL
               value: "PRODUCTION" # Options: DEVELOPMENT, PRODUCTION
-            - name: GODEBUG
-              value: x509sha1=1
             - name: CSI_NAMESPACE
               valueFrom:
                 fieldRef:
@@ -537,7 +530,7 @@ spec:
             periodSeconds: 5
             failureThreshold: 3
         - name: liveness-probe
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"
@@ -599,7 +592,7 @@ spec:
       serviceAccountName: vsphere-csi-node
       containers:
         - name: node-driver-registrar
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -622,7 +615,7 @@ spec:
               - --mode=kubelet-registration-probe
             initialDelaySeconds: 3
         - name: vsphere-csi-node
-          image: gcr.io/cloud-provider-vsphere/csi/ci/driver:latest
+          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
           args:
             - "--fss-name=internal-feature-states.csi.vsphere.vmware.com"
             - "--fss-namespace=$(CSI_NAMESPACE)"
@@ -632,7 +625,7 @@ spec:
               valueFrom:
                 fieldRef:
                   apiVersion: v1
-                  fieldPath: spec.nodeName          
+                  fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: 'unix://C:\\csi\\csi.sock'
             - name: MAX_VOLUMES_PER_NODE
@@ -657,13 +650,13 @@ spec:
             - name: plugin-dir
               mountPath: 'C:\csi'
             - name: pods-mount-dir
-              mountPath: 'C:\var\lib\kubelet'   
+              mountPath: 'C:\var\lib\kubelet'
             - name: csi-proxy-volume-v1
               mountPath: \\.\pipe\csi-proxy-volume-v1
             - name: csi-proxy-filesystem-v1
               mountPath: \\.\pipe\csi-proxy-filesystem-v1
             - name: csi-proxy-disk-v1
-              mountPath: \\.\pipe\csi-proxy-disk-v1    
+              mountPath: \\.\pipe\csi-proxy-disk-v1
             - name: csi-proxy-system-v1alpha1
               mountPath: \\.\pipe\csi-proxy-system-v1alpha1
           ports:
@@ -679,7 +672,7 @@ spec:
             periodSeconds: 5
             failureThreshold: 3
         - name: liveness-probe
-          image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
           args:
             - "--v=4"
             - "--csi-address=/csi/csi.sock"

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -546,20 +546,7 @@ data:
     ---
     apiVersion: v1
     data:
-      async-query-volume: "true"
-      block-volume-snapshot: "true"
-      cnsmgr-suspend-create-volume: "true"
-      csi-auth-check: "true"
-      csi-internal-generated-cluster-id: "true"
-      csi-migration: "true"
-      csi-windows-support: "true"
-      list-volumes: "true"
-      listview-tasks: "true"
-      max-pvscsi-targets-per-vm: "true"
-      multi-vcenter-csi-topology: "true"
-      online-volume-extend: "true"
       pv-to-backingdiskobjectid-mapping: "false"
-      topology-preferential-datastores: "true"
       trigger-csi-fullsync: "false"
     kind: ConfigMap
     metadata:
@@ -607,6 +594,18 @@ data:
             role: vsphere-csi
         spec:
           affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/controlplane
+                    operator: Exists
+                - matchExpressions:
+                  - key: node-role.kubernetes.io/master
+                    operator: Exists
             podAntiAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
               - labelSelector:
@@ -630,7 +629,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
+            image: registry.k8s.io/sig-storage/csi-attacher:v4.5.1
             name: csi-attacher
             volumeMounts:
             - mountPath: /csi
@@ -649,7 +648,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
+            image: registry.k8s.io/sig-storage/csi-resizer:v1.10.1
             name: csi-resizer
             volumeMounts:
             - mountPath: /csi
@@ -678,7 +677,7 @@ data:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -709,7 +708,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi
@@ -732,13 +731,11 @@ data:
               value: "100"
             - name: INCLUSTER_CLIENT_BURST
               value: "100"
-            - name: GODEBUG
-              value: x509sha1=1
             - name: CSI_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
+            image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.3.0
             imagePullPolicy: Always
             name: vsphere-syncer
             ports:
@@ -767,7 +764,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
+            image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
             name: csi-provisioner
             volumeMounts:
             - mountPath: /csi
@@ -785,7 +782,7 @@ data:
             env:
             - name: ADDRESS
               value: /csi/csi.sock
-            image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
+            image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
             name: csi-snapshotter
             volumeMounts:
             - mountPath: /csi
@@ -832,7 +829,7 @@ data:
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
               value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
-            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
             livenessProbe:
               exec:
                 command:
@@ -866,15 +863,13 @@ data:
               value: "true"
             - name: LOGGER_LEVEL
               value: PRODUCTION
-            - name: GODEBUG
-              value: x509sha1=1
             - name: CSI_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -910,7 +905,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi
@@ -980,7 +975,7 @@ data:
               value: unix://C:\\csi\\csi.sock
             - name: DRIVER_REG_SOCK_PATH
               value: C:\\var\\lib\\kubelet\\plugins\\csi.vsphere.vmware.com\\csi.sock
-            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
+            image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
             livenessProbe:
               exec:
                 command:
@@ -1023,7 +1018,7 @@ data:
                   fieldPath: metadata.namespace
             - name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
               value: "1"
-            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
+            image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.3.0
             imagePullPolicy: Always
             livenessProbe:
               failureThreshold: 3
@@ -1054,7 +1049,7 @@ data:
           - args:
             - --v=4
             - --csi-address=/csi/csi.sock
-            image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
+            image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
             name: liveness-probe
             volumeMounts:
             - mountPath: /csi