feat: handles sha string in tag

Signed-off-by: Nilekh Chaudhari <1626598+nilekhc@users.noreply.github.com>
kubernetes-sigs · Jun 28, 2024 · 18619d1 · 18619d1
1 parent 91025bd
commit 18619d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/...t_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
@@ -74,17 +74,17 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--provider-volume={{ .Values.windows.providersDir }}"
             - "--additional-provider-volume-paths={{ join "," .Values.windows.additionalProvidersDirs }}"
-            {{- if and (semverCompare ">= v0.0.15-0" .Values.windows.image.tag) .Values.enableSecretRotation }}
+            {{- if .Values.enableSecretRotation }}
             - "--enable-secret-rotation={{ .Values.enableSecretRotation }}"
             {{- end }}
-            {{- if and (semverCompare ">= v0.0.15-0" .Values.windows.image.tag) .Values.rotationPollInterval }}
+            {{- if .Values.rotationPollInterval }}
             - "--rotation-poll-interval={{ .Values.rotationPollInterval }}"
             {{- end }}
             - "--metrics-addr={{ .Values.windows.metricsAddr }}"
-            {{- if and (semverCompare ">= v0.0.22-0" .Values.windows.image.tag) .Values.providerHealthCheck }}
+            {{- if .Values.providerHealthCheck }}
             - "--provider-health-check={{ .Values.providerHealthCheck }}"
             {{- end }}
-            {{- if and (semverCompare ">= v0.0.22-0" .Values.windows.image.tag) .Values.providerHealthCheckInterval }}
+            {{- if .Values.providerHealthCheckInterval }}
             - "--provider-health-check-interval={{ .Values.providerHealthCheckInterval }}"
             {{- end }}
             {{- if .Values.maxCallRecvMsgSize }}
@@ -102,7 +102,6 @@ spec:
                 apiVersion: v1
                 fieldPath: spec.nodeName
           imagePullPolicy: {{ .Values.windows.image.pullPolicy }}
-          {{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
           ports:
             - containerPort: {{ .Values.livenessProbe.port }}
               name: healthz
@@ -118,7 +117,6 @@ spec:
               initialDelaySeconds: 30
               timeoutSeconds: 10
               periodSeconds: 15
-          {{- end }}
           volumeMounts:
             - name: plugin-dir
               mountPath: C:\csi
@@ -140,7 +138,6 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
-        {{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
         - name: liveness-probe
           {{- if .Values.windows.livenessProbeImage.digest }}
           image: "{{ .Values.windows.livenessProbeImage.repository }}@{{ .Values.windows.livenessProbeImage.digest }}"
@@ -160,7 +157,6 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
-        {{- end }}
       {{- if .Values.windows.priorityClassName }}
       priorityClassName: {{ .Values.windows.priorityClassName | quote }}
       {{- end }}

diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -74,17 +74,17 @@ spec:
             - "--nodeid=$(KUBE_NODE_NAME)"
             - "--provider-volume={{ .Values.linux.providersDir }}"
             - "--additional-provider-volume-paths={{ join "," .Values.linux.additionalProvidersDirs }}"
-            {{- if and (semverCompare ">= v0.0.15-0" .Values.linux.image.tag) .Values.enableSecretRotation }}
+            {{- if .Values.enableSecretRotation }}
             - "--enable-secret-rotation={{ .Values.enableSecretRotation }}"
             {{- end }}
-            {{- if and (semverCompare ">= v0.0.15-0" .Values.linux.image.tag) .Values.rotationPollInterval }}
+            {{- if .Values.rotationPollInterval }}
             - "--rotation-poll-interval={{ .Values.rotationPollInterval }}"
             {{- end }}
             - "--metrics-addr={{ .Values.linux.metricsAddr }}"
-            {{- if and (semverCompare ">= v0.0.22-0" .Values.linux.image.tag) .Values.providerHealthCheck }}
+            {{- if .Values.providerHealthCheck }}
             - "--provider-health-check={{ .Values.providerHealthCheck }}"
             {{- end }}
-            {{- if and (semverCompare ">= v0.0.22-0" .Values.linux.image.tag) .Values.providerHealthCheckInterval }}
+            {{- if .Values.providerHealthCheckInterval }}
             - "--provider-health-check-interval={{ .Values.providerHealthCheckInterval }}"
             {{- end }}
             {{- if .Values.maxCallRecvMsgSize }}
@@ -104,7 +104,6 @@ spec:
           imagePullPolicy: {{ .Values.linux.image.pullPolicy }}
           securityContext:
             privileged: true
-          {{- if semverCompare ">= v0.0.8-0" .Values.linux.image.tag }}
           ports:
             - containerPort: {{ .Values.livenessProbe.port }}
               name: healthz
@@ -120,7 +119,6 @@ spec:
               initialDelaySeconds: 30
               timeoutSeconds: 10
               periodSeconds: 15
-          {{- end }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -143,7 +141,6 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
-        {{- if semverCompare ">= v0.0.8-0" .Values.linux.image.tag }}
         - name: liveness-probe
           {{- if .Values.linux.livenessProbeImage.digest }}
           image: "{{ .Values.linux.livenessProbeImage.repository }}@{{ .Values.linux.livenessProbeImage.digest }}"
@@ -163,7 +160,6 @@ spec:
           resources:
 {{ toYaml . | indent 12 }}
 {{- end }}
-        {{- end }}
       {{- if .Values.linux.priorityClassName }}
       priorityClassName: {{ .Values.linux.priorityClassName | quote }}
       {{- end }}