Skip to content

Commit

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

release: update manifest and helm charts for v1.4.5
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Aug 20, 2024
2 parents 834d3b1 + 67892ef commit 7109b35
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 49 deletions.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ e2e-helm-deploy-release:
--set linux.enabled=true \
--set syncSecret.enabled=true \
--set enableSecretRotation=true \
--set rotationPollInterval=30s
--set rotationPollInterval=30s \
--set tokenRequests[0].audience="api://AzureADTokenExchange"

.PHONY: e2e-kind-cleanup
e2e-kind-cleanup:
Expand Down
4 changes: 2 additions & 2 deletions charts/secrets-store-csi-driver/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: secrets-store-csi-driver
version: 1.4.4
appVersion: 1.4.4
version: 1.4.5
appVersion: 1.4.5
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
14 changes: 7 additions & 7 deletions charts/secrets-store-csi-driver/README.md
View file
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.4` |
| `linux.image.tag` | Linux image tag | `v1.4.5` |
| `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.4` |
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.5` |
| `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 All @@ -52,13 +52,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `linux.metricsAddr` | The address the metric endpoint binds to | `:8095` |
| `linux.registrarImage.repository` | Linux node-driver-registrar image repository | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `linux.registrarImage.pullPolicy` | Linux node-driver-registrar image pull policy | `IfNotPresent` |
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.10.0` |
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.11.1` |
| `linux.registrarImage.digest` | Linux node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
| `linux.registrar.resources` | The resource request/limits for the linux node-driver-registrar container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
| `linux.registrar.logVerbosity` | Log level for node-driver-registrar. Uses V logs (klog) | `5` |
| `linux.livenessProbeImage.repository` | Linux liveness-probe image repository | `registry.k8s.io/sig-storage/livenessprobe` |
| `linux.livenessProbeImage.pullPolicy` | Linux liveness-probe image pull policy | `IfNotPresent` |
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.12.0` |
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.13.1` |
| `linux.livenessProbeImage.digest` | Linux liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
| `linux.livenessProbe.resources` | The resource request/limits for the linux liveness-probe container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
| `linux.env` | Environment variables to be passed for the daemonset on linux nodes | `[]` |
Expand All @@ -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.4` |
| `windows.image.tag` | Windows image tag | `v1.4.5` |
| `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 All @@ -85,13 +85,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `windows.metricsAddr` | The address the metric endpoint binds to | `:8095` |
| `windows.registrarImage.repository` | Windows node-driver-registrar image repository | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `windows.registrarImage.pullPolicy` | Windows node-driver-registrar image pull policy | `IfNotPresent` |
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.10.0` |
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.11.1` |
| `windows.registrarImage.digest` | Windows node-driver-registrar image digest, image pull from digest instead of tag if specified | `""` |
| `windows.registrar.resources` | The resource request/limits for the windows node-driver-registrar container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
| `windows.registrar.logVerbosity` | Log level for node-driver-registrar. Uses V logs (klog) | `5` |
| `windows.livenessProbeImage.repository` | Windows liveness-probe image repository | `registry.k8s.io/sig-storage/livenessprobe` |
| `windows.livenessProbeImage.pullPolicy` | Windows liveness-probe image pull policy | `IfNotPresent` |
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.12.0` |
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.13.1` |
| `windows.livenessProbeImage.digest` | Windows liveness-probe image digest, image pull from digest instead of tag if specified | `""` |
| `windows.livenessProbe.resources` | The resource request/limits for the windows liveness-probe container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
| `windows.env` | Environment variables to be passed for the daemonset on windows nodes | `[]` |
Expand Down
12 changes: 4 additions & 8 deletions charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ spec:
- "--nodeid=$(KUBE_NODE_NAME)"
- "--provider-volume={{ .Values.windows.providersDir }}"
- "--additional-provider-volume-paths={{ join "," .Values.windows.additionalProvidersDirs }}"
{{- if and (semverCompare ">= v0.0.15-0" .Values.windows.image.tag) .Values.enableSecretRotation }}
{{- if .Values.enableSecretRotation }}
- "--enable-secret-rotation={{ .Values.enableSecretRotation }}"
{{- end }}
{{- if and (semverCompare ">= v0.0.15-0" .Values.windows.image.tag) .Values.rotationPollInterval }}
{{- if .Values.rotationPollInterval }}
- "--rotation-poll-interval={{ .Values.rotationPollInterval }}"
{{- end }}
- "--metrics-addr={{ .Values.windows.metricsAddr }}"
{{- if and (semverCompare ">= v0.0.22-0" .Values.windows.image.tag) .Values.providerHealthCheck }}
{{- if .Values.providerHealthCheck }}
- "--provider-health-check={{ .Values.providerHealthCheck }}"
{{- end }}
{{- if and (semverCompare ">= v0.0.22-0" .Values.windows.image.tag) .Values.providerHealthCheckInterval }}
{{- if .Values.providerHealthCheckInterval }}
- "--provider-health-check-interval={{ .Values.providerHealthCheckInterval }}"
{{- end }}
{{- if .Values.maxCallRecvMsgSize }}
Expand All @@ -102,7 +102,6 @@ spec:
apiVersion: v1
fieldPath: spec.nodeName
imagePullPolicy: {{ .Values.windows.image.pullPolicy }}
{{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
ports:
- containerPort: {{ .Values.livenessProbe.port }}
name: healthz
Expand All @@ -118,7 +117,6 @@ spec:
initialDelaySeconds: 30
timeoutSeconds: 10
periodSeconds: 15
{{- end }}
volumeMounts:
- name: plugin-dir
mountPath: C:\csi
Expand All @@ -140,7 +138,6 @@ spec:
resources:
{{ toYaml . | indent 12 }}
{{- end }}
{{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
- name: liveness-probe
{{- if .Values.windows.livenessProbeImage.digest }}
image: "{{ .Values.windows.livenessProbeImage.repository }}@{{ .Values.windows.livenessProbeImage.digest }}"
Expand All @@ -160,7 +157,6 @@ spec:
resources:
{{ toYaml . | indent 12 }}
{{- end }}
{{- end }}
{{- if .Values.windows.priorityClassName }}
priorityClassName: {{ .Values.windows.priorityClassName | quote }}
{{- end }}
Expand Down
Loading

0 comments on commit 7109b35

Please sign in to comment.