Skip to content

Commit

Permalink
Merge pull request #884 from aramase/automated-cherry-pick-of-#883-up…
Browse files Browse the repository at this point in the history 
…stream-release-1.1

Automated cherry pick of #883: release: update manifest and helm charts for v1.1.0
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Feb 23, 2022
2 parents e28750e + c49059c commit c266fdc
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 54 deletions.
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.1.0-rc.0
appVersion: 1.1.0-rc.0
version: 1.1.0
appVersion: 1.1.0
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
16 changes: 8 additions & 8 deletions charts/secrets-store-csi-driver/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-rc.0` |
| `linux.image.tag` | Linux image tag | `v1.1.0` |
| `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.0-rc.0` |
| `linux.crds.image.tag` | Linux crds image tag | `v1.1.0` |
| `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 |
Expand All @@ -46,12 +46,12 @@ 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 | `k8s.gcr.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.4.0` |
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.5.0` |
| `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 | `k8s.gcr.io/sig-storage/livenessprobe` |
| `linux.livenessProbeImage.pullPolicy` | Linux liveness-probe image pull policy | `IfNotPresent` |
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.5.0` |
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.6.0` |
| `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 | `[]` |
| `linux.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
Expand All @@ -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.0-rc.0` |
| `windows.image.tag` | Windows image tag | `v1.1.0` |
| `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 |
Expand All @@ -75,12 +75,12 @@ 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 | `k8s.gcr.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.4.0` |
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.5.0` |
| `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 | `k8s.gcr.io/sig-storage/livenessprobe` |
| `windows.livenessProbeImage.pullPolicy` | Windows liveness-probe image pull policy | `IfNotPresent` |
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.5.0` |
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.6.0` |
| `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 | `[]` |
| `windows.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
Expand All @@ -103,4 +103,4 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `providerHealthCheck` | Enable health check for configured providers | `false` |
| `providerHealthCheckInterval` | Provider healthcheck interval duration | `2m` |
| `imagePullSecrets` | One or more secrets to be used when pulling images | `""` |
| `tokenRequests` | Token requests configuration for the csi driver. Refer to [doc](https://kubernetes-csi.github.io/docs/token-requests.html) for more info. | `""` |
| `tokenRequests` | Token requests configuration for the csi driver. Refer to [doc](https://kubernetes-csi.github.io/docs/token-requests.html) for more info. Supported only for Kubernetes v1.20+ | `""` |
2 changes: 1 addition & 1 deletion charts/secrets-store-csi-driver/templates/csidriver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
# Added in Kubernetes 1.16 with default mode of Persistent. Secrets store csi driver needs Ephermeral to be set.
volumeLifecycleModes:
- Ephemeral
{{- if .Values.tokenRequests }}
{{- if and (semverCompare ">=1.20-0" .Capabilities.KubeVersion.Version) .Values.tokenRequests }}
tokenRequests:
{{- toYaml .Values.tokenRequests | nindent 2}}
{{- end }}
17 changes: 14 additions & 3 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 @@ -76,7 +76,8 @@ spec:
{{- end }}
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
- "--provider-volume=C:\\k\\secrets-store-csi-providers"
- "--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 }}
Expand Down Expand Up @@ -131,7 +132,11 @@ spec:
- name: mountpoint-dir
mountPath: {{ .Values.windows.kubeletRootDir }}\pods
- name: providers-dir
mountPath: C:\k\secrets-store-csi-providers
mountPath: "{{ .Values.windows.providersDir }}"
{{- range $i, $path := .Values.windows.additionalProvidersDirs }}
- name: providers-dir-{{ $i }}
mountPath: "{{ $path }}"
{{- end }}
{{- if .Values.windows.volumeMounts }}
{{- toYaml .Values.windows.volumeMounts | nindent 12}}
{{- end }}
Expand Down Expand Up @@ -174,8 +179,14 @@ spec:
type: DirectoryOrCreate
- name: providers-dir
hostPath:
path: {{ .Values.windows.providersDir }}
path: "{{ .Values.windows.providersDir }}"
type: DirectoryOrCreate
{{- range $i, $path := .Values.windows.additionalProvidersDirs }}
- name: providers-dir-{{ $i }}
hostPath:
path: "{{ $path }}"
type: DirectoryOrCreate
{{- end }}
{{- if .Values.windows.volumes }}
{{- toYaml .Values.windows.volumes | nindent 8}}
{{- end }}
Expand Down
15 changes: 13 additions & 2 deletions charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ spec:
{{- end }}
- "--endpoint=$(CSI_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
- "--provider-volume=/etc/kubernetes/secrets-store-csi-providers"
- "--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 }}
Expand Down Expand Up @@ -134,7 +135,11 @@ spec:
mountPath: {{ .Values.linux.kubeletRootDir }}/pods
mountPropagation: Bidirectional
- name: providers-dir
mountPath: /etc/kubernetes/secrets-store-csi-providers
mountPath: {{ .Values.linux.providersDir }}
{{- range $i, $path := .Values.linux.additionalProvidersDirs }}
- name: providers-dir-{{ $i }}
mountPath: "{{ $path }}"
{{- end }}
{{- if .Values.linux.volumeMounts }}
{{- toYaml .Values.linux.volumeMounts | nindent 12}}
{{- end }}
Expand Down Expand Up @@ -179,6 +184,12 @@ spec:
hostPath:
path: {{ .Values.linux.providersDir }}
type: DirectoryOrCreate
{{- range $i, $path := .Values.linux.additionalProvidersDirs }}
- name: providers-dir-{{ $i }}
hostPath:
path: "{{ $path }}"
type: DirectoryOrCreate
{{- end }}
{{- if .Values.linux.volumes }}
{{- toYaml .Values.linux.volumes | nindent 8}}
{{- end }}
Expand Down
Loading

0 comments on commit c266fdc

Please sign in to comment.