From 15e958527a93a8bacc15635b608573e74666d755 Mon Sep 17 00:00:00 2001 From: Tommy Murphy Date: Thu, 31 Mar 2022 14:54:14 -0400 Subject: [PATCH] release: update manifests and helm chart for 1.1.2 Signed-off-by: Tommy Murphy --- charts/secrets-store-csi-driver/Chart.yaml | 4 ++-- charts/secrets-store-csi-driver/README.md | 6 +++--- .../secrets-store-csi-driver-windows.yaml | 15 +++++++++------ .../templates/secrets-store-csi-driver.yaml | 13 ++++++++----- charts/secrets-store-csi-driver/values.yaml | 6 +++--- deploy/secrets-store-csi-driver-windows.yaml | 2 +- deploy/secrets-store-csi-driver.yaml | 2 +- .../charts/secrets-store-csi-driver/Chart.yaml | 4 ++-- .../charts/secrets-store-csi-driver/README.md | 6 +++--- .../charts/secrets-store-csi-driver/values.yaml | 6 +++--- .../deploy/secrets-store-csi-driver-windows.yaml | 2 +- .../deploy/secrets-store-csi-driver.yaml | 2 +- 12 files changed, 37 insertions(+), 31 deletions(-) diff --git a/charts/secrets-store-csi-driver/Chart.yaml b/charts/secrets-store-csi-driver/Chart.yaml index a35a94809..bfc342fec 100644 --- 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.1.1 -appVersion: 1.1.1 +version: 1.1.2 +appVersion: 1.1.2 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 index ba1b098ec..900793c68 100644 --- a/charts/secrets-store-csi-driver/README.md +++ b/charts/secrets-store-csi-driver/README.md @@ -32,10 +32,10 @@ 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 | `k8s.gcr.io/csi-secrets-store/driver` | | `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` | -| `linux.image.tag` | Linux image tag | `v1.1.1` | +| `linux.image.tag` | Linux image tag | `v1.1.2` | | `linux.crds.image.repository` | Linux crds image repository | `k8s.gcr.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.1.1` | +| `linux.crds.image.tag` | Linux crds image tag | `v1.1.2` | | `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` | | `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` | | `linux.enabled` | Install secrets store csi driver on linux nodes | true | @@ -64,7 +64,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 | `k8s.gcr.io/csi-secrets-store/driver` | | `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` | -| `windows.image.tag` | Windows image tag | `v1.1.1` | +| `windows.image.tag` | Windows image tag | `v1.1.2` | | `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/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml index 4ce4fec83..a6bc7895a 100644 --- a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml +++ b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml @@ -76,11 +76,8 @@ spec: {{- end }} - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)" - - "--provider-volume={{ .Values.windows.providersDir }}" + - "--provider-volume={{ .Values.windows.providersDir }}" - "--additional-provider-volume-paths={{ join "," .Values.windows.additionalProvidersDirs }}" - {{- if and (semverCompare ">= v0.0.9-0" .Values.windows.image.tag) .Values.minimumProviderVersions }} - - "--min-provider-version={{ .Values.minimumProviderVersions }}" - {{- end }} {{- if and (semverCompare ">= v0.0.15-0" .Values.windows.image.tag) .Values.enableSecretRotation }} - "--enable-secret-rotation={{ .Values.enableSecretRotation }}" {{- end }} @@ -131,12 +128,15 @@ spec: mountPath: C:\csi - name: mountpoint-dir mountPath: {{ .Values.windows.kubeletRootDir }}\pods + {{- $providersDir := .Values.windows.providersDir }} - name: providers-dir - mountPath: "{{ .Values.windows.providersDir }}" + mountPath: "{{ $providersDir }}" {{- range $i, $path := .Values.windows.additionalProvidersDirs }} + {{- if ne $providersDir $path }} - name: providers-dir-{{ $i }} mountPath: "{{ $path }}" {{- end }} + {{- end }} {{- if .Values.windows.volumeMounts }} {{- toYaml .Values.windows.volumeMounts | nindent 12}} {{- end }} @@ -177,16 +177,19 @@ spec: hostPath: path: {{ .Values.windows.kubeletRootDir }}\plugins\csi-secrets-store\ type: DirectoryOrCreate + {{- $providersDir := .Values.windows.providersDir }} - name: providers-dir hostPath: - path: "{{ .Values.windows.providersDir }}" + path: "{{ $providersDir }}" type: DirectoryOrCreate {{- range $i, $path := .Values.windows.additionalProvidersDirs }} + {{- if ne $path $providersDir }} - name: providers-dir-{{ $i }} hostPath: path: "{{ $path }}" type: DirectoryOrCreate {{- end }} + {{- end }} {{- if .Values.windows.volumes }} {{- toYaml .Values.windows.volumes | nindent 8}} {{- 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 index 48a4f4028..11c80b485 100644 --- a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml +++ b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml @@ -78,9 +78,6 @@ spec: - "--nodeid=$(KUBE_NODE_NAME)" - "--provider-volume={{ .Values.linux.providersDir }}" - "--additional-provider-volume-paths={{ join "," .Values.linux.additionalProvidersDirs }}" - {{- if and (semverCompare ">= v0.0.8-0" .Values.linux.image.tag) .Values.minimumProviderVersions }} - - "--min-provider-version={{ .Values.minimumProviderVersions }}" - {{- end }} {{- if and (semverCompare ">= v0.0.15-0" .Values.linux.image.tag) .Values.enableSecretRotation }} - "--enable-secret-rotation={{ .Values.enableSecretRotation }}" {{- end }} @@ -134,12 +131,15 @@ spec: - name: mountpoint-dir mountPath: {{ .Values.linux.kubeletRootDir }}/pods mountPropagation: Bidirectional + {{- $providersDir := .Values.linux.providersDir }} - name: providers-dir - mountPath: {{ .Values.linux.providersDir }} + mountPath: {{ $providersDir }} {{- range $i, $path := .Values.linux.additionalProvidersDirs }} + {{- if ne $path $providersDir }} - name: providers-dir-{{ $i }} mountPath: "{{ $path }}" {{- end }} + {{- end }} {{- if .Values.linux.volumeMounts }} {{- toYaml .Values.linux.volumeMounts | nindent 12}} {{- end }} @@ -180,15 +180,18 @@ spec: hostPath: path: {{ .Values.linux.kubeletRootDir }}/plugins/csi-secrets-store/ type: DirectoryOrCreate + {{- $providersDir := .Values.linux.providersDir }} - name: providers-dir hostPath: - path: {{ .Values.linux.providersDir }} + path: {{ $providersDir }} type: DirectoryOrCreate {{- range $i, $path := .Values.linux.additionalProvidersDirs }} + {{- if ne $path $providersDir }} - name: providers-dir-{{ $i }} hostPath: path: "{{ $path }}" type: DirectoryOrCreate + {{- end}} {{- end }} {{- if .Values.linux.volumes }} {{- toYaml .Values.linux.volumes | nindent 8}} diff --git a/charts/secrets-store-csi-driver/values.yaml b/charts/secrets-store-csi-driver/values.yaml index 98ca6219a..4a43e8d4d 100644 --- a/charts/secrets-store-csi-driver/values.yaml +++ b/charts/secrets-store-csi-driver/values.yaml @@ -2,13 +2,13 @@ linux: enabled: true image: repository: k8s.gcr.io/csi-secrets-store/driver - tag: v1.1.1 + tag: v1.1.2 pullPolicy: IfNotPresent crds: image: repository: k8s.gcr.io/csi-secrets-store/driver-crds - tag: v1.1.1 + tag: v1.1.2 pullPolicy: IfNotPresent annotations: {} @@ -94,7 +94,7 @@ windows: enabled: false image: repository: k8s.gcr.io/csi-secrets-store/driver - tag: v1.1.1 + tag: v1.1.2 pullPolicy: IfNotPresent ## Prevent the CSI driver from being scheduled on virtual-kubelet nodes diff --git a/deploy/secrets-store-csi-driver-windows.yaml b/deploy/secrets-store-csi-driver-windows.yaml index b7b067707..77360d608 100644 --- a/deploy/secrets-store-csi-driver-windows.yaml +++ b/deploy/secrets-store-csi-driver-windows.yaml @@ -50,7 +50,7 @@ spec: cpu: 100m memory: 100Mi - name: secrets-store - image: k8s.gcr.io/csi-secrets-store/driver:v1.1.1 + image: k8s.gcr.io/csi-secrets-store/driver:v1.1.2 args: - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)" diff --git a/deploy/secrets-store-csi-driver.yaml b/deploy/secrets-store-csi-driver.yaml index a87ec3c63..a5b6f52f6 100644 --- a/deploy/secrets-store-csi-driver.yaml +++ b/deploy/secrets-store-csi-driver.yaml @@ -50,7 +50,7 @@ spec: cpu: 10m memory: 20Mi - name: secrets-store - image: k8s.gcr.io/csi-secrets-store/driver:v1.1.1 + image: k8s.gcr.io/csi-secrets-store/driver:v1.1.2 args: - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)" diff --git a/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml b/manifest_staging/charts/secrets-store-csi-driver/Chart.yaml index a35a94809..bfc342fec 100644 --- 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.1.1 -appVersion: 1.1.1 +version: 1.1.2 +appVersion: 1.1.2 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 index ba1b098ec..900793c68 100644 --- a/manifest_staging/charts/secrets-store-csi-driver/README.md +++ b/manifest_staging/charts/secrets-store-csi-driver/README.md @@ -32,10 +32,10 @@ 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 | `k8s.gcr.io/csi-secrets-store/driver` | | `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` | -| `linux.image.tag` | Linux image tag | `v1.1.1` | +| `linux.image.tag` | Linux image tag | `v1.1.2` | | `linux.crds.image.repository` | Linux crds image repository | `k8s.gcr.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.1.1` | +| `linux.crds.image.tag` | Linux crds image tag | `v1.1.2` | | `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` | | `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` | | `linux.enabled` | Install secrets store csi driver on linux nodes | true | @@ -64,7 +64,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 | `k8s.gcr.io/csi-secrets-store/driver` | | `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` | -| `windows.image.tag` | Windows image tag | `v1.1.1` | +| `windows.image.tag` | Windows image tag | `v1.1.2` | | `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 index 98ca6219a..4a43e8d4d 100644 --- a/manifest_staging/charts/secrets-store-csi-driver/values.yaml +++ b/manifest_staging/charts/secrets-store-csi-driver/values.yaml @@ -2,13 +2,13 @@ linux: enabled: true image: repository: k8s.gcr.io/csi-secrets-store/driver - tag: v1.1.1 + tag: v1.1.2 pullPolicy: IfNotPresent crds: image: repository: k8s.gcr.io/csi-secrets-store/driver-crds - tag: v1.1.1 + tag: v1.1.2 pullPolicy: IfNotPresent annotations: {} @@ -94,7 +94,7 @@ windows: enabled: false image: repository: k8s.gcr.io/csi-secrets-store/driver - tag: v1.1.1 + tag: v1.1.2 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 index b7b067707..77360d608 100644 --- a/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml +++ b/manifest_staging/deploy/secrets-store-csi-driver-windows.yaml @@ -50,7 +50,7 @@ spec: cpu: 100m memory: 100Mi - name: secrets-store - image: k8s.gcr.io/csi-secrets-store/driver:v1.1.1 + image: k8s.gcr.io/csi-secrets-store/driver:v1.1.2 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 index a87ec3c63..a5b6f52f6 100644 --- a/manifest_staging/deploy/secrets-store-csi-driver.yaml +++ b/manifest_staging/deploy/secrets-store-csi-driver.yaml @@ -50,7 +50,7 @@ spec: cpu: 10m memory: 20Mi - name: secrets-store - image: k8s.gcr.io/csi-secrets-store/driver:v1.1.1 + image: k8s.gcr.io/csi-secrets-store/driver:v1.1.2 args: - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)"