[Update] Bumping up the version for side cars to latest available versions (#265)

komer3 · web-flow · commit e54da7d7afb9 · 2024-09-26T13:00:07.000-05:00
* update: bumping up the version for side cars to latest available versions

* test-fix: make the luks mov consistent. Adding rollout status commad to wait for pods to finish rolling out to new node

---------

Co-authored-by: Khaja Omer &lt;komer@akamai.com&gt;
diff --git a/deploy/kubernetes/base/ds-csi-linode-node.yaml b/deploy/kubernetes/base/ds-csi-linode-node.yaml
@@ -35,7 +35,7 @@ spec:
       hostNetwork: true
       containers:
         - name: csi-node-driver-registrar
-          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v1.3.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
           args:
             - "--v=2"
             - "--csi-address=$(ADDRESS)"
diff --git a/deploy/kubernetes/base/ss-csi-linode-controller.yaml b/deploy/kubernetes/base/ss-csi-linode-controller.yaml
@@ -36,7 +36,7 @@ spec:
             mountPath: /scripts
       containers:
         - name: csi-provisioner
-          image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
+          image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
           imagePullPolicy: IfNotPresent
           args:
             - "--default-fstype=ext4"
@@ -51,7 +51,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
-          image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
           imagePullPolicy: IfNotPresent
           args:
             - "--v=2"
@@ -63,7 +63,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-resizer
-          image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0
+          image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
           imagePullPolicy: IfNotPresent
           args:
           - "--v=2"
@@ -74,7 +74,7 @@ spec:
           volumeMounts:
           - name: socket-dir
             mountPath: /var/lib/csi/sockets/pluginproxy/
-        - name: linode-csi-plugin
+        - name: csi-linode-plugin
           image: linode/linode-blockstorage-csi-driver:latest
           args:
             - "--v=2"
diff --git a/helm-chart/csi-driver/templates/csi-linode-controller.yaml b/helm-chart/csi-driver/templates/csi-linode-controller.yaml
@@ -78,7 +78,7 @@ spec:
               key: {{ if .Values.secretRef }}{{ .Values.secretRef.apiTokenRef | default "token" }}{{ else }}"token"{{ end }}
         image: {{ .Values.csiLinodePlugin.image }}:{{ .Values.csiLinodePlugin.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.csiLinodePlugin.pullPolicy }}
-        name: linode-csi-plugin
+        name: csi-linode-plugin
         volumeMounts:
         - mountPath: /linode-info
           name: linode-info
diff --git a/helm-chart/csi-driver/values.yaml b/helm-chart/csi-driver/values.yaml
@@ -31,17 +31,17 @@ defaultStorageClass: linode-block-storage-retain
 
 csiProvisioner:
   image: registry.k8s.io/sig-storage/csi-provisioner
-  tag: v3.0.0
+  tag: v5.1.0
   pullPolicy: IfNotPresent
 
 csiAttacher:
   image: registry.k8s.io/sig-storage/csi-attacher
-  tag: v3.3.0
+  tag: v4.7.0
   pullPolicy: IfNotPresent
 
 csiResizer:
   image: registry.k8s.io/sig-storage/csi-resizer
-  tag: v1.3.0
+  tag: v1.12.0
   pullPolicy: IfNotPresent
 
 csiLinodePlugin:
@@ -56,4 +56,4 @@ kubectl:
 
 csiNodeDriverRegistrar:
   image: registry.k8s.io/sig-storage/csi-node-driver-registrar
-  tag: v1.3.0
+  tag: v2.12.0
diff --git a/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml b/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml
@@ -317,7 +317,7 @@ spec:
         env:
         - name: ADDRESS
           value: /var/lib/csi/sockets/pluginproxy/csi.sock
-        image: registry.k8s.io/sig-storage/csi-provisioner:v3.0.0
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
         imagePullPolicy: IfNotPresent
         name: csi-provisioner
         volumeMounts:
@@ -329,7 +329,7 @@ spec:
         env:
         - name: ADDRESS
           value: /var/lib/csi/sockets/pluginproxy/csi.sock
-        image: registry.k8s.io/sig-storage/csi-attacher:v3.3.0
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
         imagePullPolicy: IfNotPresent
         name: csi-attacher
         volumeMounts:
@@ -341,23 +341,18 @@ spec:
         env:
         - name: ADDRESS
           value: /var/lib/csi/sockets/pluginproxy/csi.sock
-        image: registry.k8s.io/sig-storage/csi-resizer:v1.3.0
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
         imagePullPolicy: IfNotPresent
         name: csi-resizer
         volumeMounts:
         - mountPath: /var/lib/csi/sockets/pluginproxy/
           name: socket-dir
       - args:
-        - --endpoint=$(CSI_ENDPOINT)
-        - --token=$(LINODE_TOKEN)
-        - --url=$(LINODE_API_URL)
-        - --node=$(NODE_NAME)
-        - --bs-prefix=$(LINODE_BS_PREFIX)
         - --v=2
         env:
         - name: CSI_ENDPOINT
           value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-        - name: LINODE_API_URL
+        - name: LINODE_URL
           value: https://api.linode.com/v4
         - name: LINODE_BS_PREFIX
         - name: NODE_NAME
@@ -371,7 +366,7 @@ spec:
               key: token
               name: linode
         image: linode/linode-blockstorage-csi-driver:latest
-        name: linode-csi-plugin
+        name: csi-linode-plugin
         volumeMounts:
         - mountPath: /linode-info
           name: linode-info
@@ -444,23 +439,19 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v1.3.0
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
         name: csi-node-driver-registrar
         volumeMounts:
         - mountPath: /csi
           name: plugin-dir
         - mountPath: /registration
           name: registration-dir
       - args:
-        - --endpoint=$(CSI_ENDPOINT)
-        - --token=$(LINODE_TOKEN)
-        - --url=$(LINODE_API_URL)
-        - --node=$(NODE_NAME)
         - --v=2
         env:
         - name: CSI_ENDPOINT
           value: unix:///csi/csi.sock
-        - name: LINODE_API_URL
+        - name: LINODE_URL
           value: https://api.linode.com/v4
         - name: NODE_NAME
           valueFrom:
@@ -566,7 +557,7 @@ spec:
           type: Directory
         name: tmp
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: linodebs.csi.linode.com
diff --git a/tests/csi-sanity/mkdir_in_pod.sh b/tests/csi-sanity/mkdir_in_pod.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-kubectl exec csi-linode-controller-0 -n kube-system -c linode-csi-plugin -- mktemp -d /tmp/csi-sanity.XXXXXX
+kubectl exec csi-linode-controller-0 -n kube-system -c csi-linode-plugin -- mktemp -d /tmp/csi-sanity.XXXXXX
diff --git a/tests/csi-sanity/rmdir_in_pod.sh b/tests/csi-sanity/rmdir_in_pod.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-kubectl exec csi-linode-controller-0 -n kube-system -c linode-csi-plugin -- rmdir "$@"
+kubectl exec csi-linode-controller-0 -n kube-system -c csi-linode-plugin -- rmdir "$@"
diff --git a/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml b/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml
@@ -132,7 +132,8 @@ spec:
               - name: NAMESPACE
                 value: ($namespace)
             content: |
-              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE
+              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE && \
+              kubectl rollout status statefulset/test-statefulset -n $NAMESPACE --timeout=300s
             check:
               ($error): ~
     - name: Check if Pod is ready and Volume is mounted (On worker node)
@@ -211,7 +212,8 @@ spec:
               - name: NAMESPACE
                 value: ($namespace)
             content: |
-              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE
+              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE && \
+              kubectl rollout status statefulset/test-statefulset -n $NAMESPACE --timeout=300s
             check:
               ($error): ~
     - name: Check if Pod is ready and Volume is mounted (after moving back to control plane node)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		`-kubectl exec csi-linode-controller-0 -n kube-system -c linode-csi-plugin -- mktemp -d /tmp/csi-sanity.XXXXXX`
	`2`	`+kubectl exec csi-linode-controller-0 -n kube-system -c csi-linode-plugin -- mktemp -d /tmp/csi-sanity.XXXXXX`