Skip to content

Commit 2d0b596

Browse files
authored
Merge pull request #1465 from aramase/automated-cherry-pick-of-#1463-upstream-release-1.4
Automated cherry pick of #1463: release: update manifest and helm charts for v1.4.2
2 parents 0f50b4c + 7526f1a commit 2d0b596

12 files changed

+38
-70
lines changed

charts/secrets-store-csi-driver/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: secrets-store-csi-driver
3-
version: 1.4.1
4-
appVersion: 1.4.1
3+
version: 1.4.2
4+
appVersion: 1.4.2
55
kubeVersion: ">=1.16.0-0"
66
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

charts/secrets-store-csi-driver/README.md

Lines changed: 13 additions & 13 deletions
Large diffs are not rendered by default.

charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ spec:
4747
- --v={{ .Values.windows.registrar.logVerbosity }}
4848
- "--csi-address=unix://C:\\csi\\csi.sock"
4949
- --kubelet-registration-path={{ .Values.windows.kubeletRootDir }}\plugins\csi-secrets-store\csi.sock
50-
livenessProbe:
51-
exec:
52-
command:
53-
- /csi-node-driver-registrar.exe
54-
- --kubelet-registration-path={{ .Values.windows.kubeletRootDir }}\plugins\csi-secrets-store\csi.sock
55-
- --mode=kubelet-registration-probe
56-
initialDelaySeconds: 30
57-
timeoutSeconds: 15
5850
imagePullPolicy: {{ .Values.windows.registrarImage.pullPolicy }}
5951
volumeMounts:
6052
- name: plugin-dir

charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ spec:
4747
- --v={{ .Values.linux.registrar.logVerbosity }}
4848
- --csi-address=/csi/csi.sock
4949
- --kubelet-registration-path={{ .Values.linux.kubeletRootDir }}/plugins/csi-secrets-store/csi.sock
50-
livenessProbe:
51-
exec:
52-
command:
53-
- /csi-node-driver-registrar
54-
- --kubelet-registration-path={{ .Values.linux.kubeletRootDir }}/plugins/csi-secrets-store/csi.sock
55-
- --mode=kubelet-registration-probe
56-
initialDelaySeconds: 30
57-
timeoutSeconds: 15
5850
imagePullPolicy: {{ .Values.linux.registrarImage.pullPolicy }}
5951
volumeMounts:
6052
- name: plugin-dir

charts/secrets-store-csi-driver/values.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ linux:
22
enabled: true
33
image:
44
repository: registry.k8s.io/csi-secrets-store/driver
5-
tag: v1.4.1
5+
tag: v1.4.2
66
#digest: sha256:
77
pullPolicy: IfNotPresent
88

99
crds:
1010
enabled: true
1111
image:
1212
repository: registry.k8s.io/csi-secrets-store/driver-crds
13-
tag: v1.4.1
13+
tag: v1.4.2
1414
pullPolicy: IfNotPresent
1515
## Optionally override resource limits for crd hooks(jobs)
1616
resources: {}
@@ -45,7 +45,7 @@ linux:
4545

4646
registrarImage:
4747
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
48-
tag: v2.8.0
48+
tag: v2.10.0
4949
#digest: sha256:
5050
pullPolicy: IfNotPresent
5151

@@ -61,7 +61,7 @@ linux:
6161

6262
livenessProbeImage:
6363
repository: registry.k8s.io/sig-storage/livenessprobe
64-
tag: v2.10.0
64+
tag: v2.12.0
6565
#digest: sha256:
6666
pullPolicy: IfNotPresent
6767

@@ -110,7 +110,7 @@ windows:
110110
enabled: false
111111
image:
112112
repository: registry.k8s.io/csi-secrets-store/driver
113-
tag: v1.4.1
113+
tag: v1.4.2
114114
#digest: sha256:
115115
pullPolicy: IfNotPresent
116116

@@ -136,7 +136,7 @@ windows:
136136

137137
registrarImage:
138138
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
139-
tag: v2.8.0
139+
tag: v2.10.0
140140
#digest: sha256:
141141
pullPolicy: IfNotPresent
142142

@@ -152,7 +152,7 @@ windows:
152152

153153
livenessProbeImage:
154154
repository: registry.k8s.io/sig-storage/livenessprobe
155-
tag: v2.10.0
155+
tag: v2.12.0
156156
#digest: sha256:
157157
pullPolicy: IfNotPresent
158158

deploy/secrets-store-csi-driver-windows.yaml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,11 @@ spec:
1717
serviceAccountName: secrets-store-csi-driver
1818
containers:
1919
- name: node-driver-registrar
20-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
20+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
2121
args:
2222
- --v=5
2323
- "--csi-address=unix://C:\\csi\\csi.sock"
2424
- "--kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\csi-secrets-store\\csi.sock"
25-
livenessProbe:
26-
exec:
27-
command:
28-
- /csi-node-driver-registrar.exe
29-
- --kubelet-registration-path=C:\var\lib\kubelet\plugins\csi-secrets-store\csi.sock
30-
- --mode=kubelet-registration-probe
31-
initialDelaySeconds: 30
32-
timeoutSeconds: 15
3325
imagePullPolicy: IfNotPresent
3426
volumeMounts:
3527
- name: plugin-dir
@@ -44,7 +36,7 @@ spec:
4436
cpu: 100m
4537
memory: 100Mi
4638
- name: secrets-store
47-
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
39+
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
4840
args:
4941
- "--endpoint=$(CSI_ENDPOINT)"
5042
- "--nodeid=$(KUBE_NODE_NAME)"
@@ -93,7 +85,7 @@ spec:
9385
- name: providers-dir
9486
mountPath: C:\k\secrets-store-csi-providers
9587
- name: liveness-probe
96-
image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
88+
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
9789
imagePullPolicy: IfNotPresent
9890
args:
9991
- "--csi-address=unix://C:\\csi\\csi.sock"

deploy/secrets-store-csi-driver.yaml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,11 @@ spec:
1717
serviceAccountName: secrets-store-csi-driver
1818
containers:
1919
- name: node-driver-registrar
20-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
20+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
2121
args:
2222
- --v=5
2323
- --csi-address=/csi/csi.sock
2424
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi-secrets-store/csi.sock
25-
livenessProbe:
26-
exec:
27-
command:
28-
- /csi-node-driver-registrar
29-
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi-secrets-store/csi.sock
30-
- --mode=kubelet-registration-probe
31-
initialDelaySeconds: 30
32-
timeoutSeconds: 15
3325
imagePullPolicy: IfNotPresent
3426
volumeMounts:
3527
- name: plugin-dir
@@ -44,7 +36,7 @@ spec:
4436
cpu: 10m
4537
memory: 20Mi
4638
- name: secrets-store
47-
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
39+
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
4840
args:
4941
- "--endpoint=$(CSI_ENDPOINT)"
5042
- "--nodeid=$(KUBE_NODE_NAME)"
@@ -99,7 +91,7 @@ spec:
9991
cpu: 50m
10092
memory: 100Mi
10193
- name: liveness-probe
102-
image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
94+
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
10395
imagePullPolicy: IfNotPresent
10496
args:
10597
- --csi-address=/csi/csi.sock

manifest_staging/charts/secrets-store-csi-driver/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: secrets-store-csi-driver
3-
version: 1.4.1
4-
appVersion: 1.4.1
3+
version: 1.4.2
4+
appVersion: 1.4.2
55
kubeVersion: ">=1.16.0-0"
66
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

manifest_staging/charts/secrets-store-csi-driver/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ The following table lists the configurable parameters of the csi-secrets-store-p
3333
| `fullnameOverride` | String to fully override secrets-store-csi-driver.fullname template with a string | `""` |
3434
| `linux.image.repository` | Linux image repository | `registry.k8s.io/csi-secrets-store/driver` |
3535
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
36-
| `linux.image.tag` | Linux image tag | `v1.4.1` |
36+
| `linux.image.tag` | Linux image tag | `v1.4.2` |
3737
| `linux.image.digest` | Linux image digest, image pull from digest instead of tag if specified | `""` |
3838
| `linux.crds.enabled` | If the CRDs should be managed by the chart | `true` |
3939
| `linux.crds.image.repository` | Linux crds image repository | `registry.k8s.io/csi-secrets-store/driver-crds` |
4040
| `linux.crds.image.pullPolicy` | Linux crds image pull policy | `IfNotPresent` |
41-
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.1` |
41+
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.2` |
4242
| `linux.crds.resources` | The resource request/limits for the linux crds container image | `{}` |
4343
| `linux.crds.podLabels` | Linux *Pod* labels appended to CRD helm hook job pods | `{}` |
4444
| `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
@@ -72,7 +72,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
7272
| `linux.updateStrategy` | Configure a custom update strategy for the daemonset on linux nodes | `RollingUpdate with 1 maxUnavailable` |
7373
| `windows.image.repository` | Windows image repository | `registry.k8s.io/csi-secrets-store/driver` |
7474
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
75-
| `windows.image.tag` | Windows image tag | `v1.4.1` |
75+
| `windows.image.tag` | Windows image tag | `v1.4.2` |
7676
| `windows.image.digest` | Windows image digest, image pull from digest instead of tag if specified | `""` |
7777
| `windows.affinity` | Windows affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
7878
| `windows.driver.resources` | The resource request/limits for the windows secrets-store container image | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |

manifest_staging/charts/secrets-store-csi-driver/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ linux:
22
enabled: true
33
image:
44
repository: registry.k8s.io/csi-secrets-store/driver
5-
tag: v1.4.1
5+
tag: v1.4.2
66
#digest: sha256:
77
pullPolicy: IfNotPresent
88

99
crds:
1010
enabled: true
1111
image:
1212
repository: registry.k8s.io/csi-secrets-store/driver-crds
13-
tag: v1.4.1
13+
tag: v1.4.2
1414
pullPolicy: IfNotPresent
1515
## Optionally override resource limits for crd hooks(jobs)
1616
resources: {}
@@ -110,7 +110,7 @@ windows:
110110
enabled: false
111111
image:
112112
repository: registry.k8s.io/csi-secrets-store/driver
113-
tag: v1.4.1
113+
tag: v1.4.2
114114
#digest: sha256:
115115
pullPolicy: IfNotPresent
116116

manifest_staging/deploy/secrets-store-csi-driver-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
cpu: 100m
3737
memory: 100Mi
3838
- name: secrets-store
39-
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
39+
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
4040
args:
4141
- "--endpoint=$(CSI_ENDPOINT)"
4242
- "--nodeid=$(KUBE_NODE_NAME)"

manifest_staging/deploy/secrets-store-csi-driver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
cpu: 10m
3737
memory: 20Mi
3838
- name: secrets-store
39-
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
39+
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
4040
args:
4141
- "--endpoint=$(CSI_ENDPOINT)"
4242
- "--nodeid=$(KUBE_NODE_NAME)"

0 commit comments

Comments
 (0)