Skip to content

Commit

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

Automated cherry pick of #1375: release: update manifest and helm charts for v1.4.0
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Nov 20, 2023
2 parents 0d24da7 + b961b3e commit 37ed5c9
Show file tree
Hide file tree
Showing 18 changed files with 96 additions and 52 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.3.4
appVersion: 1.3.4
version: 1.4.0
appVersion: 1.4.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
12 changes: 9 additions & 3 deletions charts/secrets-store-csi-driver/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +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.3.4` |
| `linux.image.tag` | Linux image tag | `v1.4.0` |
| `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.3.4` |
| `linux.crds.image.tag` | Linux crds image tag | `v1.4.0` |
| `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,11 +53,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `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.8.0` |
| `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.10.0` |
| `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 | `[]` |
| `linux.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
Expand All @@ -69,7 +72,8 @@ 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.3.4` |
| `windows.image.tag` | Windows image tag | `v1.4.0` |
| `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` |
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |
Expand All @@ -82,11 +86,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
| `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.8.0` |
| `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.10.0` |
| `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 | `[]` |
| `windows.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
Expand Down
16 changes: 1 addition & 15 deletions charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.4
controller-gen.kubebuilder.io/version: v0.12.1
name: secretproviderclasses.secrets-store.csi.x-k8s.io
spec:
group: secrets-store.csi.x-k8s.io
Expand Down Expand Up @@ -82,20 +82,6 @@ spec:
type: object
status:
description: SecretProviderClassStatus defines the observed state of SecretProviderClass
properties:
byPod:
items:
description: ByPodStatus defines the state of SecretProviderClass
as seen by an individual controller
properties:
id:
description: id of the pod that wrote the status
type: string
namespace:
description: namespace of the pod that wrote the status
type: string
type: object
type: array
type: object
type: object
served: true
Expand Down
2 changes: 1 addition & 1 deletion ...rets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.4
controller-gen.kubebuilder.io/version: v0.12.1
name: secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io
spec:
group: secrets-store.csi.x-k8s.io
Expand Down
21 changes: 21 additions & 0 deletions charts/secrets-store-csi-driver/templates/role-secretproviderclasspodstatuses-viewer.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{{ if .Values.rbac.install }}

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
labels:
{{ include "sscd.labels" . | indent 4 }}
rbac.authorization.k8s.io/aggregate-to-view: "true"
name: secretproviderclasspodstatuses-viewer-role
rules:
- apiGroups:
- secrets-store.csi.x-k8s.io
resources:
- secretproviderclasspodstatuses
verbs:
- get
- list
- watch
{{ end }}
12 changes: 12 additions & 0 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 @@ -38,7 +38,11 @@ spec:
{{ toYaml .Values.windows.affinity | indent 8 }}
containers:
- name: node-driver-registrar
{{- if .Values.windows.registrarImage.digest }}
image: "{{ .Values.windows.registrarImage.repository }}@{{ .Values.windows.registrarImage.digest }}"
{{- else }}
image: "{{ .Values.windows.registrarImage.repository }}:{{ .Values.windows.registrarImage.tag }}"
{{- end }}
args:
- --v={{ .Values.windows.registrar.logVerbosity }}
- "--csi-address=unix://C:\\csi\\csi.sock"
Expand All @@ -62,7 +66,11 @@ spec:
{{ toYaml . | indent 12 }}
{{- end }}
- name: secrets-store
{{- if .Values.windows.image.digest }}
image: "{{ .Values.windows.image.repository }}@{{ .Values.windows.image.digest }}"
{{- else }}
image: "{{ .Values.windows.image.repository }}:{{ .Values.windows.image.tag }}"
{{- end }}
args:
{{- if .Values.logVerbosity }}
- -v={{ .Values.logVerbosity }}
Expand Down Expand Up @@ -142,7 +150,11 @@ spec:
{{- 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 }}"
{{- else }}
image: "{{ .Values.windows.livenessProbeImage.repository }}:{{ .Values.windows.livenessProbeImage.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.windows.livenessProbeImage.pullPolicy }}
args:
- "--csi-address=unix://C:\\csi\\csi.sock"
Expand Down
12 changes: 12 additions & 0 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 @@ -38,7 +38,11 @@ spec:
{{ toYaml .Values.linux.affinity | indent 8 }}
containers:
- name: node-driver-registrar
{{- if .Values.linux.registrarImage.digest }}
image: "{{ .Values.linux.registrarImage.repository }}@{{ .Values.linux.registrarImage.digest }}"
{{- else }}
image: "{{ .Values.linux.registrarImage.repository }}:{{ .Values.linux.registrarImage.tag }}"
{{- end }}
args:
- --v={{ .Values.linux.registrar.logVerbosity }}
- --csi-address=/csi/csi.sock
Expand All @@ -62,7 +66,11 @@ spec:
{{ toYaml . | indent 12 }}
{{- end }}
- name: secrets-store
{{- if .Values.linux.image.digest }}
image: "{{ .Values.linux.image.repository }}@{{ .Values.linux.image.digest }}"
{{- else }}
image: "{{ .Values.linux.image.repository }}:{{ .Values.linux.image.tag }}"
{{- end }}
args:
{{- if .Values.logVerbosity }}
- -v={{ .Values.logVerbosity }}
Expand Down Expand Up @@ -145,7 +153,11 @@ spec:
{{- end }}
{{- if semverCompare ">= v0.0.8-0" .Values.linux.image.tag }}
- name: liveness-probe
{{- if .Values.linux.livenessProbeImage.digest }}
image: "{{ .Values.linux.livenessProbeImage.repository }}@{{ .Values.linux.livenessProbeImage.digest }}"
{{- else }}
image: "{{ .Values.linux.livenessProbeImage.repository }}:{{ .Values.linux.livenessProbeImage.tag }}"
{{- end }}
imagePullPolicy: {{ .Values.linux.livenessProbeImage.pullPolicy }}
args:
- --csi-address=/csi/csi.sock
Expand Down

0 comments on commit 37ed5c9

Please sign in to comment.