Merge pull request #1122 from aramase/automated-cherry-pick-of-#1121-…

…upstream-release-1.3 Automated cherry pick of #1121: release: update manifest and helm charts for v1.3.0
kubernetes-sigs · Dec 13, 2022 · d08eaa9 · d08eaa9
2 parents 9ababf4 + 1c7fda4
commit d08eaa9
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 51 deletions.
diff --git a/charts/secrets-store-csi-driver/Chart.yaml b/charts/secrets-store-csi-driver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: secrets-store-csi-driver
-version: 1.2.4
-appVersion: 1.2.4
+version: 1.3.0
+appVersion: 1.3.0
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

diff --git a/charts/secrets-store-csi-driver/README.md b/charts/secrets-store-csi-driver/README.md
diff --git a/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml b/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.linux.crds.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -114,6 +115,10 @@ spec:
         - -f
         - crds/
         imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
+        {{- with .Values.linux.crds.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       nodeSelector:
         kubernetes.io/os: linux
 {{- if .Values.linux.nodeSelector }}
@@ -123,3 +128,4 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
 {{- end }}
+{{- end }}
diff --git a/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml b/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.linux.crds.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -117,6 +118,10 @@ spec:
         - -p
         - '{"metadata":{"annotations": {"helm.sh/resource-policy": "keep"}}}'
         imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
+        {{- with .Values.linux.crds.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       nodeSelector:
         kubernetes.io/os: linux
 {{- if .Values.linux.nodeSelector }}
@@ -126,3 +131,4 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
 {{- end }}
+{{- end }}
diff --git a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -18,12 +18,12 @@ spec:
 {{ toYaml .Values.linux.updateStrategy | indent 4 }}
   template:
     metadata:
-      annotations:
       labels:
 {{ include "sscd.labels" . | indent 8 }}
 {{- if .Values.linux.podLabels }}
 {{- toYaml .Values.linux.podLabels | nindent 8 }}
 {{- end }}
+      annotations:
         kubectl.kubernetes.io/default-container: secrets-store
 {{- if .Values.linux.podAnnotations }}
 {{ toYaml .Values.linux.podAnnotations | indent 8 }}

diff --git a/charts/secrets-store-csi-driver/values.yaml b/charts/secrets-store-csi-driver/values.yaml
@@ -1,15 +1,24 @@
 linux:
   enabled: true
   image:
-    repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v1.2.4
+    repository: registry.k8s.io/csi-secrets-store/driver
+    tag: v1.3.0
     pullPolicy: IfNotPresent
 
   crds:
+    enabled: true
     image:
-      repository: k8s.gcr.io/csi-secrets-store/driver-crds
-      tag: v1.2.4
+      repository: registry.k8s.io/csi-secrets-store/driver-crds
+      tag: v1.3.0
       pullPolicy: IfNotPresent
+    ## Optionally override resource limits for crd hooks(jobs)
+    resources: {}
+      # requests:
+      #   cpu: "100m"
+      #   memory: "128Mi"
+      # limits:
+      #   cpu: "500m"
+      #   memory: "512Mi"
     annotations: {}
     podLabels: {}
 
@@ -34,8 +43,8 @@ linux:
         memory: 100Mi
 
   registrarImage:
-    repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-    tag: v2.5.1
+    repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    tag: v2.6.2
     pullPolicy: IfNotPresent
 
   registrar:
@@ -49,8 +58,8 @@ linux:
     logVerbosity: 5
 
   livenessProbeImage:
-    repository: k8s.gcr.io/sig-storage/livenessprobe
-    tag: v2.7.0
+    repository: registry.k8s.io/sig-storage/livenessprobe
+    tag: v2.8.0
     pullPolicy: IfNotPresent
 
   livenessProbe:
@@ -72,7 +81,10 @@ linux:
   additionalProvidersDirs:
     - /etc/kubernetes/secrets-store-csi-providers
   nodeSelector: {}
-  tolerations: []
+  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
+  # An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.
+  tolerations:
+    - operator: "Exists"
   metricsAddr: ":8095"
   env: []
   priorityClassName: ""
@@ -94,8 +106,8 @@ linux:
 windows:
   enabled: false
   image:
-    repository: k8s.gcr.io/csi-secrets-store/driver
-    tag: v1.2.4
+    repository: registry.k8s.io/csi-secrets-store/driver
+    tag: v1.3.0
     pullPolicy: IfNotPresent
 
   ## Prevent the CSI driver from being scheduled on virtual-kubelet nodes
@@ -119,8 +131,8 @@ windows:
         memory: 100Mi
 
   registrarImage:
-    repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-    tag: v2.5.1
+    repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    tag: v2.6.2
     pullPolicy: IfNotPresent
 
   registrar:
@@ -134,8 +146,8 @@ windows:
     logVerbosity: 5
 
   livenessProbeImage:
-    repository: k8s.gcr.io/sig-storage/livenessprobe
-    tag: v2.7.0
+    repository: registry.k8s.io/sig-storage/livenessprobe
+    tag: v2.8.0
     pullPolicy: IfNotPresent
 
   livenessProbe:
@@ -156,7 +168,10 @@ windows:
   providersDir: C:\\k\\secrets-store-csi-providers
   additionalProvidersDirs:
   nodeSelector: {}
-  tolerations: []
+  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
+  # An empty key with operator Exists matches all keys, values and effects which means this will tolerate everything.
+  tolerations:
+    - operator: "Exists"
   metricsAddr: ":8095"
   env: []
   priorityClassName: ""

diff --git a/deploy/secrets-store-csi-driver-windows.yaml b/deploy/secrets-store-csi-driver-windows.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: secrets-store-csi-driver
       containers:
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2
           args:
             - --v=5
             - "--csi-address=unix://C:\\csi\\csi.sock"
@@ -44,7 +44,7 @@ spec:
               cpu: 100m
               memory: 100Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v1.2.4
+          image: registry.k8s.io/csi-secrets-store/driver:v1.3.0
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
@@ -93,7 +93,7 @@ spec:
             - name: providers-dir
               mountPath: C:\k\secrets-store-csi-providers
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.7.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
           imagePullPolicy: IfNotPresent
           args:
           - "--csi-address=unix://C:\\csi\\csi.sock"
@@ -127,5 +127,7 @@ spec:
           hostPath:
             path: C:\k\secrets-store-csi-providers\
             type: DirectoryOrCreate
+      tolerations:
+      - operator: Exists
       nodeSelector:
         kubernetes.io/os: windows
diff --git a/deploy/secrets-store-csi-driver.yaml b/deploy/secrets-store-csi-driver.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: secrets-store-csi-driver
       containers:
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.2
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
@@ -44,7 +44,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: k8s.gcr.io/csi-secrets-store/driver:v1.2.4
+          image: registry.k8s.io/csi-secrets-store/driver:v1.3.0
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
@@ -99,7 +99,7 @@ spec:
               cpu: 50m
               memory: 100Mi
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.7.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
           imagePullPolicy: IfNotPresent
           args:
           - --csi-address=/csi/csi.sock
@@ -137,5 +137,7 @@ spec:
           hostPath:
             path: /var/run/secrets-store-csi-providers
             type: DirectoryOrCreate
+      tolerations:
+      - operator: Exists
       nodeSelector:
         kubernetes.io/os: linux
diff --git a/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml b/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: secrets-store-csi-driver
-version: 1.2.4
-appVersion: 1.2.4
+version: 1.3.0
+appVersion: 1.3.0
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

diff --git a/manifest_staging/charts/secrets-store-csi-driver/README.md b/manifest_staging/charts/secrets-store-csi-driver/README.md
@@ -33,11 +33,11 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `fullnameOverride`                      | String to fully override secrets-store-csi-driver.fullname template with a string                                                                                              | `""`                                                    |
 | `linux.image.repository`                | Linux image repository                                                                                                                                                         | `registry.k8s.io/csi-secrets-store/driver`              |
 | `linux.image.pullPolicy`                | Linux image pull policy                                                                                                                                                        | `IfNotPresent`                                          |
-| `linux.image.tag`                       | Linux image tag                                                                                                                                                                | `v1.2.4`                                                |
+| `linux.image.tag`                       | Linux image tag                                                                                                                                                                | `v1.3.0`                                                |
 | `linux.crds.enabled`                    | If the CRDs should be managed by the chart                                                                                                                                     | `true`                                                  |
 | `linux.crds.image.repository`           | Linux crds image repository                                                                                                                                                    | `registry.k8s.io/csi-secrets-store/driver-crds`         |
 | `linux.crds.image.pullPolicy`           | Linux crds image pull policy                                                                                                                                                   | `IfNotPresent`                                          |
-| `linux.crds.image.tag`                  | Linux crds image tag                                                                                                                                                           | `v1.2.4`                                                |
+| `linux.crds.image.tag`                  | Linux crds image tag                                                                                                                                                           | `v1.3.0`                                                |
 | `linux.crds.resources`                  | The resource request/limits for the linux crds container image                                                                                                                 | `{}`                                                    |
 | `linux.crds.podLabels`                  | Linux *Pod* labels appended to CRD helm hook job pods                                                                                                                          | `{}`                                                    |
 | `linux.affinity`                        | Linux affinity                                                                                                                                                                 | `key: type; operator: NotIn; values: [virtual-kubelet]` |
@@ -69,7 +69,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.updateStrategy`                  | Configure a custom update strategy for the daemonset on linux nodes                                                                                                            | `RollingUpdate with 1 maxUnavailable`                   |
 | `windows.image.repository`              | Windows image repository                                                                                                                                                       | `registry.k8s.io/csi-secrets-store/driver`              |
 | `windows.image.pullPolicy`              | Windows image pull policy                                                                                                                                                      | `IfNotPresent`                                          |
-| `windows.image.tag`                     | Windows image tag                                                                                                                                                              | `v1.2.4`                                                |
+| `windows.image.tag`                     | Windows image tag                                                                                                                                                              | `v1.3.0`                                                |
 | `windows.affinity`                      | Windows affinity                                                                                                                                                               | `key: type; operator: NotIn; values: [virtual-kubelet]` |
 | `windows.driver.resources`              | The resource request/limits for the windows secrets-store container image                                                                                                      | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi`     |
 | `windows.enabled`                       | Install secrets store csi driver on windows nodes                                                                                                                              | false                                                   |

diff --git a/manifest_staging/charts/secrets-store-csi-driver/values.yaml b/manifest_staging/charts/secrets-store-csi-driver/values.yaml
@@ -2,14 +2,14 @@ linux:
   enabled: true
   image:
     repository: registry.k8s.io/csi-secrets-store/driver
-    tag: v1.2.4
+    tag: v1.3.0
     pullPolicy: IfNotPresent
 
   crds:
     enabled: true
     image:
       repository: registry.k8s.io/csi-secrets-store/driver-crds
-      tag: v1.2.4
+      tag: v1.3.0
       pullPolicy: IfNotPresent
     ## Optionally override resource limits for crd hooks(jobs)
     resources: {}
@@ -107,7 +107,7 @@ windows:
   enabled: false
   image:
     repository: registry.k8s.io/csi-secrets-store/driver
-    tag: v1.2.4
+    tag: v1.3.0
     pullPolicy: IfNotPresent
 
   ## Prevent the CSI driver from being scheduled on virtual-kubelet nodes

diff --git a/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml b/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml
@@ -44,7 +44,7 @@ spec:
               cpu: 100m
               memory: 100Mi
         - name: secrets-store
-          image: registry.k8s.io/csi-secrets-store/driver:v1.2.4
+          image: registry.k8s.io/csi-secrets-store/driver:v1.3.0
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"

diff --git a/manifest_staging/deploy/secrets-store-csi-driver.yaml b/manifest_staging/deploy/secrets-store-csi-driver.yaml
@@ -44,7 +44,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: secrets-store
-          image: registry.k8s.io/csi-secrets-store/driver:v1.2.4
+          image: registry.k8s.io/csi-secrets-store/driver:v1.3.0
           args:
             - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"