From ee2e94d7fb25cfa5e745f689aa4ad2b9cf1d8977 Mon Sep 17 00:00:00 2001
From: jack <62025739+1602077@users.noreply.github.com>
Date: Tue, 9 Jul 2024 14:00:44 +0200
Subject: [PATCH] deploy: set plugin image tags from Chart AppVersion (#16)

* deploy: plugin image tags default to pull from Chart AppVersion

* fix csi-node-driver-registrar version
---
 deployments/helm/eosxd-csi/Chart.yaml                |  4 ++--
 .../templates/controllerplugin-deployment.yaml       |  4 ++--
 .../eosxd-csi/templates/nodeplugin-daemonset.yaml    |  6 +++---
 deployments/helm/eosxd-csi/values.yaml               | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/deployments/helm/eosxd-csi/Chart.yaml b/deployments/helm/eosxd-csi/Chart.yaml
index f3db48a..595fd1f 100644
--- a/deployments/helm/eosxd-csi/Chart.yaml
+++ b/deployments/helm/eosxd-csi/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "latest"
+appVersion: "v1.4.0"
 description: A Helm chart to deploy the eosxd-CSI Plugin
 name: eosxd-csi
-version: "1.0.0"
+version: 1.4.0
diff --git a/deployments/helm/eosxd-csi/templates/controllerplugin-deployment.yaml b/deployments/helm/eosxd-csi/templates/controllerplugin-deployment.yaml
index 0c51258..6763a41 100644
--- a/deployments/helm/eosxd-csi/templates/controllerplugin-deployment.yaml
+++ b/deployments/helm/eosxd-csi/templates/controllerplugin-deployment.yaml
@@ -21,7 +21,7 @@ spec:
       serviceAccount: {{ include "eosxd-csi.serviceAccountName.controllerplugin" . }}
       containers:
         - name: provisioner
-          image: {{ .Values.controllerplugin.provisioner.image.repository }}:{{ .Values.controllerplugin.provisioner.image.tag }}
+          image: {{ .Values.controllerplugin.provisioner.image.repository }}:{{ .Values.controllerplugin.provisioner.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.controllerplugin.provisioner.image.pullPolicy }}
           args:
             - -v={{ .Values.logVerbosityLevel }}
@@ -37,7 +37,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: controllerplugin
-          image: {{ .Values.controllerplugin.plugin.image.repository }}:{{ .Values.controllerplugin.plugin.image.tag }}
+          image: {{ .Values.controllerplugin.plugin.image.repository }}:{{ .Values.controllerplugin.plugin.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.controllerplugin.plugin.image.pullPolicy }}
           command: [/csi-driver]
           args:
diff --git a/deployments/helm/eosxd-csi/templates/nodeplugin-daemonset.yaml b/deployments/helm/eosxd-csi/templates/nodeplugin-daemonset.yaml
index f5afc55..e0b33f9 100644
--- a/deployments/helm/eosxd-csi/templates/nodeplugin-daemonset.yaml
+++ b/deployments/helm/eosxd-csi/templates/nodeplugin-daemonset.yaml
@@ -45,7 +45,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: nodeplugin
-          image: {{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}
+          image: {{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag | default .Chart.AppVersion }}
           command: [/csi-driver]
           args:
             - -v={{ .Values.logVerbosityLevel }}
@@ -92,7 +92,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: automount
-          image: {{ .Values.nodeplugin.automount.image.repository }}:{{ .Values.nodeplugin.automount.image.tag }}
+          image: {{ .Values.nodeplugin.automount.image.repository }}:{{ .Values.nodeplugin.automount.image.tag | default .Chart.AppVersion }}
           command: [/automount-runner]
           args:
             - -v={{ .Values.logVerbosityLevel }}
@@ -121,7 +121,7 @@ spec:
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
         - name: mountreconciler
-          image: {{ .Values.nodeplugin.mountreconciler.image.repository }}:{{ .Values.nodeplugin.mountreconciler.image.tag }}
+          image: {{ .Values.nodeplugin.mountreconciler.image.repository }}:{{ .Values.nodeplugin.mountreconciler.image.tag | default .Chart.AppVersion }}
           command: [/mount-reconciler]
           args:
             - -v={{ .Values.logVerbosityLevel }}
diff --git a/deployments/helm/eosxd-csi/values.yaml b/deployments/helm/eosxd-csi/values.yaml
index f30602f..0d7bf16 100644
--- a/deployments/helm/eosxd-csi/values.yaml
+++ b/deployments/helm/eosxd-csi/values.yaml
@@ -192,7 +192,7 @@ nodeplugin:
   plugin:
     image:
       repository: registry.cern.ch/kubernetes/eosxd-csi
-      tag: v1.1.1
+      tag: "" # If no tag specified default to Chart AppVersion.
       pullPolicy: IfNotPresent
     resources: {}
     # Extra volume mounts to append to nodeplugin's
@@ -205,7 +205,7 @@ nodeplugin:
   automount:
     image:
       repository: registry.cern.ch/kubernetes/eosxd-csi
-      tag: v1.1.1
+      tag: "" # If no tag specified default to Chart AppVersion.
       pullPolicy: IfNotPresent
     resources: {}
     # Extra volume mounts to append to nodeplugin's
@@ -226,7 +226,7 @@ nodeplugin:
   mountreconciler:
     image:
       repository: registry.cern.ch/kubernetes/eosxd-csi
-      tag: v1.1.1
+      tag: "" # If no tag specified default to Chart AppVersion.
       pullPolicy: IfNotPresent
     resources: {}
     # Extra volume mounts to append to nodeplugin's
@@ -239,7 +239,7 @@ nodeplugin:
   registrar:
     image:
       repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
-      tag: v2.5.1
+      tag: v2.10.1
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -300,7 +300,7 @@ controllerplugin:
   plugin:
     image:
       repository: registry.cern.ch/kubernetes/eosxd-csi
-      tag: v1.1.1
+      tag: "" # If no tag specified default to Chart AppVersion.
       pullPolicy: IfNotPresent
     resources: {}
     extraVolumeMounts:
@@ -311,7 +311,7 @@ controllerplugin:
   provisioner:
     image:
       repository: k8s.gcr.io/sig-storage/csi-provisioner
-      tag: v3.2.1
+      tag: v4.0.1
       pullPolicy: IfNotPresent
     resources: {}