Skip to content

Commit

Permalink
Merge pull request #1465 from aramase/automated-cherry-pick-of-#1463-…
Browse files Browse the repository at this point in the history
…upstream-release-1.4

Automated cherry pick of #1463: release: update manifest and helm charts for v1.4.2
  • Loading branch information
k8s-ci-robot committed Mar 11, 2024
2 parents 0f50b4c + 7526f1a commit 2d0b596
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 70 deletions.
4 changes: 2 additions & 2 deletions charts/secrets-store-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: secrets-store-csi-driver
version: 1.4.1
appVersion: 1.4.1
version: 1.4.2
appVersion: 1.4.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
Expand Down
26 changes: 13 additions & 13 deletions charts/secrets-store-csi-driver/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ spec:
- --v={{ .Values.windows.registrar.logVerbosity }}
- "--csi-address=unix://C:\\csi\\csi.sock"
- --kubelet-registration-path={{ .Values.windows.kubeletRootDir }}\plugins\csi-secrets-store\csi.sock
livenessProbe:
exec:
command:
- /csi-node-driver-registrar.exe
- --kubelet-registration-path={{ .Values.windows.kubeletRootDir }}\plugins\csi-secrets-store\csi.sock
- --mode=kubelet-registration-probe
initialDelaySeconds: 30
timeoutSeconds: 15
imagePullPolicy: {{ .Values.windows.registrarImage.pullPolicy }}
volumeMounts:
- name: plugin-dir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ spec:
- --v={{ .Values.linux.registrar.logVerbosity }}
- --csi-address=/csi/csi.sock
- --kubelet-registration-path={{ .Values.linux.kubeletRootDir }}/plugins/csi-secrets-store/csi.sock
livenessProbe:
exec:
command:
- /csi-node-driver-registrar
- --kubelet-registration-path={{ .Values.linux.kubeletRootDir }}/plugins/csi-secrets-store/csi.sock
- --mode=kubelet-registration-probe
initialDelaySeconds: 30
timeoutSeconds: 15
imagePullPolicy: {{ .Values.linux.registrarImage.pullPolicy }}
volumeMounts:
- name: plugin-dir
Expand Down
14 changes: 7 additions & 7 deletions charts/secrets-store-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ linux:
enabled: true
image:
repository: registry.k8s.io/csi-secrets-store/driver
tag: v1.4.1
tag: v1.4.2
#digest: sha256:
pullPolicy: IfNotPresent

crds:
enabled: true
image:
repository: registry.k8s.io/csi-secrets-store/driver-crds
tag: v1.4.1
tag: v1.4.2
pullPolicy: IfNotPresent
## Optionally override resource limits for crd hooks(jobs)
resources: {}
Expand Down Expand Up @@ -45,7 +45,7 @@ linux:

registrarImage:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.8.0
tag: v2.10.0
#digest: sha256:
pullPolicy: IfNotPresent

Expand All @@ -61,7 +61,7 @@ linux:

livenessProbeImage:
repository: registry.k8s.io/sig-storage/livenessprobe
tag: v2.10.0
tag: v2.12.0
#digest: sha256:
pullPolicy: IfNotPresent

Expand Down Expand Up @@ -110,7 +110,7 @@ windows:
enabled: false
image:
repository: registry.k8s.io/csi-secrets-store/driver
tag: v1.4.1
tag: v1.4.2
#digest: sha256:
pullPolicy: IfNotPresent

Expand All @@ -136,7 +136,7 @@ windows:

registrarImage:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.8.0
tag: v2.10.0
#digest: sha256:
pullPolicy: IfNotPresent

Expand All @@ -152,7 +152,7 @@ windows:

livenessProbeImage:
repository: registry.k8s.io/sig-storage/livenessprobe
tag: v2.10.0
tag: v2.12.0
#digest: sha256:
pullPolicy: IfNotPresent

Expand Down
14 changes: 3 additions & 11 deletions deploy/secrets-store-csi-driver-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,11 @@ spec:
serviceAccountName: secrets-store-csi-driver
containers:
- name: node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
args:
- --v=5
- "--csi-address=unix://C:\\csi\\csi.sock"
- "--kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\csi-secrets-store\\csi.sock"
livenessProbe:
exec:
command:
- /csi-node-driver-registrar.exe
- --kubelet-registration-path=C:\var\lib\kubelet\plugins\csi-secrets-store\csi.sock
- --mode=kubelet-registration-probe
initialDelaySeconds: 30
timeoutSeconds: 15
imagePullPolicy: IfNotPresent
volumeMounts:
- name: plugin-dir
Expand All @@ -44,7 +36,7 @@ spec:
cpu: 100m
memory: 100Mi
- name: secrets-store
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
Expand Down Expand Up @@ -93,7 +85,7 @@ spec:
- name: providers-dir
mountPath: C:\k\secrets-store-csi-providers
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
imagePullPolicy: IfNotPresent
args:
- "--csi-address=unix://C:\\csi\\csi.sock"
Expand Down
14 changes: 3 additions & 11 deletions deploy/secrets-store-csi-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,11 @@ spec:
serviceAccountName: secrets-store-csi-driver
containers:
- name: node-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
args:
- --v=5
- --csi-address=/csi/csi.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi-secrets-store/csi.sock
livenessProbe:
exec:
command:
- /csi-node-driver-registrar
- --kubelet-registration-path=/var/lib/kubelet/plugins/csi-secrets-store/csi.sock
- --mode=kubelet-registration-probe
initialDelaySeconds: 30
timeoutSeconds: 15
imagePullPolicy: IfNotPresent
volumeMounts:
- name: plugin-dir
Expand All @@ -44,7 +36,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: secrets-store
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
Expand Down Expand Up @@ -99,7 +91,7 @@ spec:
cpu: 50m
memory: 100Mi
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.10.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.12.0
imagePullPolicy: IfNotPresent
args:
- --csi-address=/csi/csi.sock
Expand Down
4 changes: 2 additions & 2 deletions manifest_staging/charts/secrets-store-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: secrets-store-csi-driver
version: 1.4.1
appVersion: 1.4.1
version: 1.4.2
appVersion: 1.4.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
Expand Down
6 changes: 3 additions & 3 deletions manifest_staging/charts/secrets-store-csi-driver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ 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.4.1` |
| `linux.image.tag` | Linux image tag | `v1.4.2` |
| `linux.image.digest` | Linux image digest, image pull from digest instead of tag if specified | `""` |
| `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.4.1` |
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.2` |
| `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]` |
Expand Down Expand Up @@ -72,7 +72,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.4.1` |
| `windows.image.tag` | Windows image tag | `v1.4.2` |
| `windows.image.digest` | Windows image digest, image pull from digest instead of tag if specified | `""` |
| `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` |
Expand Down
6 changes: 3 additions & 3 deletions manifest_staging/charts/secrets-store-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ linux:
enabled: true
image:
repository: registry.k8s.io/csi-secrets-store/driver
tag: v1.4.1
tag: v1.4.2
#digest: sha256:
pullPolicy: IfNotPresent

crds:
enabled: true
image:
repository: registry.k8s.io/csi-secrets-store/driver-crds
tag: v1.4.1
tag: v1.4.2
pullPolicy: IfNotPresent
## Optionally override resource limits for crd hooks(jobs)
resources: {}
Expand Down Expand Up @@ -110,7 +110,7 @@ windows:
enabled: false
image:
repository: registry.k8s.io/csi-secrets-store/driver
tag: v1.4.1
tag: v1.4.2
#digest: sha256:
pullPolicy: IfNotPresent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
cpu: 100m
memory: 100Mi
- name: secrets-store
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
Expand Down
2 changes: 1 addition & 1 deletion manifest_staging/deploy/secrets-store-csi-driver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: secrets-store
image: registry.k8s.io/csi-secrets-store/driver:v1.4.1
image: registry.k8s.io/csi-secrets-store/driver:v1.4.2
args:
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
Expand Down

0 comments on commit 2d0b596

Please sign in to comment.