Skip to content

Commit ed51ed4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1460 from aramase/automated-cherry-pick-of-#1459-upstream-release-1.4
Automated cherry pick of #1459: chore: update node-driver-registrar:v2.10.0,
2 parents 330cdf2 + 9fd198c commit ed51ed4

File tree

6 files changed

+18
-50
lines changed

6 files changed

+18
-50
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
3434
| `linux.image.repository` | Linux image repository | `registry.k8s.io/csi-secrets-store/driver` |
3535
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
3636
| `linux.image.tag` | Linux image tag | `v1.4.1` |
37-
| `linux.image.digest` | Linux image digest, image pull from digest instead of tag if specified | `""` |
37+
| `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` |
@@ -52,14 +52,14 @@ The following table lists the configurable parameters of the csi-secrets-store-p
5252
| `linux.metricsAddr` | The address the metric endpoint binds to | `:8095` |
5353
| `linux.registrarImage.repository` | Linux node-driver-registrar image repository | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
5454
| `linux.registrarImage.pullPolicy` | Linux node-driver-registrar image pull policy | `IfNotPresent` |
55-
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.8.0` |
56-
| `linux.registrarImage.digest` | Linux node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
55+
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.10.0` |
56+
| `linux.registrarImage.digest` | Linux node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
5757
| `linux.registrar.resources` | The resource request/limits for the linux node-driver-registrar container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
5858
| `linux.registrar.logVerbosity` | Log level for node-driver-registrar. Uses V logs (klog) | `5` |
5959
| `linux.livenessProbeImage.repository` | Linux liveness-probe image repository | `registry.k8s.io/sig-storage/livenessprobe` |
6060
| `linux.livenessProbeImage.pullPolicy` | Linux liveness-probe image pull policy | `IfNotPresent` |
61-
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.10.0` |
62-
| `linux.livenessProbeImage.digest` | Linux liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
61+
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.12.0` |
62+
| `linux.livenessProbeImage.digest` | Linux liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
6363
| `linux.livenessProbe.resources` | The resource request/limits for the linux liveness-probe container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
6464
| `linux.env` | Environment variables to be passed for the daemonset on linux nodes | `[]` |
6565
| `linux.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
@@ -73,7 +73,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
7373
| `windows.image.repository` | Windows image repository | `registry.k8s.io/csi-secrets-store/driver` |
7474
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
7575
| `windows.image.tag` | Windows image tag | `v1.4.1` |
76-
| `windows.image.digest` | Windows image digest, image pull from digest instead of tag if specified | `""` |
76+
| `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` |
7979
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |
@@ -85,14 +85,14 @@ The following table lists the configurable parameters of the csi-secrets-store-p
8585
| `windows.metricsAddr` | The address the metric endpoint binds to | `:8095` |
8686
| `windows.registrarImage.repository` | Windows node-driver-registrar image repository | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
8787
| `windows.registrarImage.pullPolicy` | Windows node-driver-registrar image pull policy | `IfNotPresent` |
88-
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.8.0` |
89-
| `windows.registrarImage.digest` | Windows node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
88+
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.10.0` |
89+
| `windows.registrarImage.digest` | Windows node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
9090
| `windows.registrar.resources` | The resource request/limits for the windows node-driver-registrar container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
9191
| `windows.registrar.logVerbosity` | Log level for node-driver-registrar. Uses V logs (klog) | `5` |
9292
| `windows.livenessProbeImage.repository` | Windows liveness-probe image repository | `registry.k8s.io/sig-storage/livenessprobe` |
9393
| `windows.livenessProbeImage.pullPolicy` | Windows liveness-probe image pull policy | `IfNotPresent` |
94-
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.10.0` |
95-
| `windows.livenessProbeImage.digest` | Windows liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
94+
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.12.0` |
95+
| `windows.livenessProbeImage.digest` | Windows liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
9696
| `windows.livenessProbe.resources` | The resource request/limits for the windows liveness-probe container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
9797
| `windows.env` | Environment variables to be passed for the daemonset on windows nodes | `[]` |
9898
| `windows.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |

‎manifest_staging/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

‎manifest_staging/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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -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

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

Lines changed: 2 additions & 10 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
@@ -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"

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

Lines changed: 2 additions & 10 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
@@ -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

0 commit comments

Comments
 (0)