Skip to content

Commit 3c1d909

Browse files
authored
Merge pull request #295 from aramase/release-v0.0.13
release: update manifest and helm charts for v0.0.13
2 parents 2f9ae0b + e10c6c5 commit 3c1d909

25 files changed

+295
-176
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ kubectl apply -f deploy/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml
108108
kubectl apply -f deploy/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml
109109
kubectl apply -f deploy/secrets-store-csi-driver.yaml --namespace $NAMESPACE
110110

111+
# If using the driver to sync secrets-store content as Kubernetes Secrets, deploy the additional RBAC permissions
112+
# required to enable this feature
113+
kubectl apply -f deploy/rbac-secretproviderclass.yaml
114+
111115
# [OPTIONAL] For kubernetes version < 1.16 running `kubectl apply -f deploy/csidriver.yaml` will fail. To install the driver run
112116
kubectl apply -f deploy/csidriver-1.15.yaml
113117

charts/index.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
11
apiVersion: v1
22
entries:
33
secrets-store-csi-driver:
4+
- apiVersion: v1
5+
appVersion: 0.0.13
6+
created: "2020-08-17T18:08:01.599946-07:00"
7+
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
8+
cluster.
9+
digest: 426ea403ad1083cae569a13d8ecf686e4797b7816f6254709070afc4f4b858ab
10+
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
11+
kubeVersion: '>=1.15.0-0'
12+
maintainers:
13+
- email: ritazh@microsoft.com
14+
name: Rita Zhang
15+
name: secrets-store-csi-driver
16+
sources:
17+
- https://github.com/kubernetes-sigs/secrets-store-csi-driver
18+
urls:
19+
- https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.13.tgz
20+
version: 0.0.13
421
- apiVersion: v1
522
appVersion: 0.0.12
6-
created: "2020-07-21T17:21:06.530228-07:00"
23+
created: "2020-08-17T18:08:01.599247-07:00"
724
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
825
cluster.
926
digest: 0c132d4be8c4eb48109a4fe8cc0ce29e6fc9f68647bb522c4040d033861a0e78
@@ -20,7 +37,7 @@ entries:
2037
version: 0.0.12
2138
- apiVersion: v1
2239
appVersion: 0.0.11
23-
created: "2020-07-21T17:21:06.529597-07:00"
40+
created: "2020-08-17T18:08:01.597723-07:00"
2441
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
2542
cluster.
2643
digest: 2751ae7aed8ea2fc7dcdcbbf26240fccb2eefd83d3943cef45bb58bb1d297692
@@ -37,7 +54,7 @@ entries:
3754
version: 0.0.11
3855
- apiVersion: v1
3956
appVersion: 0.0.10
40-
created: "2020-07-21T17:21:06.528357-07:00"
57+
created: "2020-08-17T18:08:01.595105-07:00"
4158
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
4259
cluster.
4360
digest: 9fae95e4611c9c120ed12505e735680b70ed133ea987fd32db05046cb45eda9e
@@ -54,7 +71,7 @@ entries:
5471
version: 0.0.10
5572
- apiVersion: v1
5673
appVersion: 0.0.9
57-
created: "2020-07-21T17:21:06.530963-07:00"
74+
created: "2020-08-17T18:08:01.601014-07:00"
5875
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
5976
cluster.
6077
digest: 0f74454ca36c979a352d8a7b6d847521897ebf78195527ed8946201a841887a7
@@ -69,4 +86,4 @@ entries:
6986
urls:
7087
- https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.9.tgz
7188
version: 0.0.9
72-
generated: "2020-07-21T17:21:06.526827-07:00"
89+
generated: "2020-08-17T18:08:01.591471-07:00"
5.83 KB
Binary file not shown.

charts/secrets-store-csi-driver/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: secrets-store-csi-driver
3-
version: 0.0.12
4-
appVersion: 0.0.12
3+
version: 0.0.13
4+
appVersion: 0.0.13
55
kubeVersion: ">=1.15.0-0"
66
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes cluster.
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png

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

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,43 @@ $ helm install csi-secrets-store secrets-store-csi-driver/secrets-store-csi-driv
1919

2020
The following table lists the configurable parameters of the csi-secrets-store-provider-azure chart and their default values.
2121

22-
| Parameter | Description | Default |
23-
| --------- | ----------- | ------- |
24-
| `nameOverride` | String to partially override secrets-store-csi-driver.fullname template with a string (will prepend the release name) | `""` |
25-
| `fullnameOverride` | String to fully override secrets-store-csi-driver.fullname template with a string | `""` |
26-
| `linux.image.repository` | Linux image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
27-
| `linux.image.pullPolicy` | Linux image pull policy | `Always` |
28-
| `linux.image.tag` | Linux image tag | `v0.0.12` |
29-
| `linux.enabled` | Install secrets store csi driver on linux nodes | true |
30-
| `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
31-
| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
32-
| `linux.metricsAddr` | The address the metric endpoint binds to | `:8080` |
33-
| `windows.image.repository` | Windows image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
34-
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
35-
| `windows.image.tag` | Windows image tag | `v0.0.12` |
36-
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |
37-
| `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |
38-
| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
39-
| `windows.metricsAddr` | The address the metric endpoint binds to | `:8080` |
40-
| `logLevel.debug` | Enable debug logging | true |
41-
| `livenessProbe.port` | Liveness probe port | `9808` |
42-
| `livenessProbe.logLevel` | Liveness probe container logging verbosity level | `2` |
43-
| `rbac.install` | Install default rbac roles and bindings | true |
44-
| `minimumProviderVersions` | A comma delimited list of key-value pairs of minimum provider versions with driver | `""` |
22+
| Parameter | Description | Default |
23+
| --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
24+
| `nameOverride` | String to partially override secrets-store-csi-driver.fullname template with a string (will prepend the release name) | `""` |
25+
| `fullnameOverride` | String to fully override secrets-store-csi-driver.fullname template with a string | `""` |
26+
| `linux.image.repository` | Linux image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
27+
| `linux.image.pullPolicy` | Linux image pull policy | `Always` |
28+
| `linux.image.tag` | Linux image tag | `v0.0.13` |
29+
| `linux.enabled` | Install secrets store csi driver on linux nodes | true |
30+
| `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
31+
| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
32+
| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[]` |
33+
| `linux.metricsAddr` | The address the metric endpoint binds to | `:8080` |
34+
| `linux.registrarImage.repository` | Linux node-driver-registrar image repository | `quay.io/k8scsi/csi-node-driver-registrar` |
35+
| `linux.registrarImage.pullPolicy` | Linux node-driver-registrar image pull policy | `Always` |
36+
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v1.2.0` |
37+
| `linux.livenessProbeImage.repository` | Linux liveness-probe image repository | `quay.io/k8scsi/livenessprobe` |
38+
| `linux.livenessProbeImage.pullPolicy` | Linux liveness-probe image pull policy | `Always` |
39+
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.0.0` |
40+
| `linux.env` | Environment variables to be passed for the daemonset on linux nodes | `[]` |
41+
| `windows.image.repository` | Windows image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
42+
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
43+
| `windows.image.tag` | Windows image tag | `v0.0.13` |
44+
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |
45+
| `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |
46+
| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
47+
| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `[]` |
48+
| `windows.metricsAddr` | The address the metric endpoint binds to | `:8080` |
49+
| `windows.registrarImage.repository` | Windows node-driver-registrar image repository | `mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar` |
50+
| `windows.registrarImage.pullPolicy` | Windows node-driver-registrar image pull policy | `Always` |
51+
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v1.2.1-alpha.1-windows-1809-amd64` |
52+
| `windows.livenessProbeImage.repository` | Windows liveness-probe image repository | `mcr.microsoft.com/oss/kubernetes-csi/livenessprobe` |
53+
| `windows.livenessProbeImage.pullPolicy` | Windows liveness-probe image pull policy | `Always` |
54+
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.0.1-alpha.1-windows-1809-amd64` |
55+
| `windows.env` | Environment variables to be passed for the daemonset on windows nodes | `[]` |
56+
| `logLevel.debug` | Enable debug logging | true |
57+
| `livenessProbe.port` | Liveness probe port | `9808` |
58+
| `livenessProbe.logLevel` | Liveness probe container logging verbosity level | `2` |
59+
| `rbac.install` | Install default rbac roles and bindings | true |
60+
| `syncSecret.enabled` | Enable rbac roles and bindings required for syncing to Kubernetes native secrets (the default will change to false after v0.0.14) | true |
61+
| `minimumProviderVersions` | A comma delimited list of key-value pairs of minimum provider versions with driver | `""` |

charts/secrets-store-csi-driver/templates/_helpers.tpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Standard labels for helm resources
2525
*/}}
2626
{{- define "sscd.labels" -}}
2727
labels:
28-
heritage: "{{ .Release.Service }}"
29-
release: "{{ .Release.Name }}"
30-
revision: "{{ .Release.Revision }}"
31-
chart: "{{ .Chart.Name }}"
32-
chartVersion: "{{ .Chart.Version }}"
28+
app.kubernetes.io/instance: "{{ .Release.Name }}"
29+
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
30+
app.kubernetes.io/name: "{{ template "sscd.name" . }}"
31+
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
3332
app: {{ template "sscd.name" . }}
33+
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
3434
{{- end -}}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{{ if .Values.syncSecret.enabled }}
2+
3+
---
4+
apiVersion: rbac.authorization.k8s.io/v1
5+
kind: ClusterRole
6+
metadata:
7+
creationTimestamp: null
8+
name: secretprovidersyncing-role
9+
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- secrets
14+
verbs:
15+
- create
16+
- delete
17+
- get
18+
- list
19+
- patch
20+
- update
21+
- watch
22+
{{ end }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{ if .Values.syncSecret.enabled }}
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRoleBinding
4+
metadata:
5+
name: secretprovidersyncing-rolebinding
6+
roleRef:
7+
apiGroup: rbac.authorization.k8s.io
8+
kind: ClusterRole
9+
name: secretprovidersyncing-role
10+
subjects:
11+
- kind: ServiceAccount
12+
name: secrets-store-csi-driver
13+
namespace: {{ .Release.Namespace }}
14+
{{ end }}
Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{{ if .Values.rbac.install }}
2+
23
---
34
apiVersion: rbac.authorization.k8s.io/v1
45
kind: ClusterRole
56
metadata:
7+
creationTimestamp: null
68
name: secretproviderclasses-role
79
rules:
810
- apiGroups:
@@ -12,29 +14,7 @@ rules:
1214
verbs:
1315
- get
1416
- list
15-
- update
1617
- watch
17-
- apiGroups:
18-
- secrets-store.csi.x-k8s.io
19-
resources:
20-
- secretproviderclasses/status
21-
verbs:
22-
- get
23-
- patch
24-
- update
25-
- watch
26-
- apiGroups:
27-
- ""
28-
resources:
29-
- secrets
30-
verbs:
31-
- create
32-
- delete
33-
- get
34-
- update
35-
- patch
36-
- watch
37-
- list
3818
- apiGroups:
3919
- secrets-store.csi.x-k8s.io
4020
resources:
@@ -53,6 +33,6 @@ rules:
5333
- secretproviderclasspodstatuses/status
5434
verbs:
5535
- get
56-
- update
5736
- patch
37+
- update
5838
{{ end }}

charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: secrets-store-csi-driver
1717
containers:
1818
- name: node-driver-registrar
19-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v1.2.1-alpha.1-windows-1809-amd64
19+
image: "{{ .Values.windows.registrarImage.repository }}:{{ .Values.windows.registrarImage.tag }}"
2020
args:
2121
- --v=5
2222
- "--csi-address=unix://C:\\csi\\csi.sock"
@@ -31,12 +31,12 @@ spec:
3131
"del /f C:\\registration\\secrets-store.csi.k8s.io-reg.sock",
3232
]
3333
env:
34-
- name: KUBE_NODE_NAME
35-
valueFrom:
36-
fieldRef:
37-
apiVersion: v1
38-
fieldPath: spec.nodeName
39-
imagePullPolicy: Always
34+
- name: KUBE_NODE_NAME
35+
valueFrom:
36+
fieldRef:
37+
apiVersion: v1
38+
fieldPath: spec.nodeName
39+
imagePullPolicy: {{ .Values.windows.registrarImage.pullPolicy }}
4040
volumeMounts:
4141
- name: plugin-dir
4242
mountPath: C:\csi
@@ -54,13 +54,16 @@ spec:
5454
{{- end }}
5555
- "--metrics-addr={{ .Values.windows.metricsAddr }}"
5656
env:
57-
- name: CSI_ENDPOINT
58-
value: unix://C:\\csi\\csi.sock
59-
- name: KUBE_NODE_NAME
60-
valueFrom:
61-
fieldRef:
62-
apiVersion: v1
63-
fieldPath: spec.nodeName
57+
{{- with .Values.windows.env }}
58+
{{- toYaml . | nindent 10 }}
59+
{{- end }}
60+
- name: CSI_ENDPOINT
61+
value: unix://C:\\csi\\csi.sock
62+
- name: KUBE_NODE_NAME
63+
valueFrom:
64+
fieldRef:
65+
apiVersion: v1
66+
fieldPath: spec.nodeName
6467
imagePullPolicy: {{ .Values.windows.image.pullPolicy }}
6568
securityContext:
6669
privileged: true
@@ -88,8 +91,8 @@ spec:
8891
mountPath: C:\k\secrets-store-csi-providers
8992
{{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
9093
- name: liveness-probe
91-
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.0.1-alpha.1-windows-1809-amd64
92-
imagePullPolicy: Always
94+
image: "{{ .Values.windows.livenessProbeImage.repository }}:{{ .Values.windows.livenessProbeImage.tag }}"
95+
imagePullPolicy: {{ .Values.windows.livenessProbeImage.pullPolicy }}
9396
args:
9497
- "--csi-address=unix://C:\\csi\\csi.sock"
9598
- --probe-timeout=3s
@@ -120,4 +123,8 @@ spec:
120123
{{- if .Values.windows.nodeSelector }}
121124
{{- toYaml .Values.windows.nodeSelector | nindent 8 }}
122125
{{- end }}
126+
{{- with .Values.windows.tolerations }}
127+
tolerations:
128+
{{ toYaml . | indent 8 }}
129+
{{- end }}
123130
{{- end -}}

0 commit comments

Comments
 (0)