Skip to content

Commit 7f131d7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #662 from aramase/automated-cherry-pick-of-#660-upstream-release-0.1
Automated cherry pick of #660: release: update manifests for v0.1.0
2 parents 1a1ddca + d42639b commit 7f131d7

24 files changed

+308
-133
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ e2e-aws:
436436
manifests: $(CONTROLLER_GEN) $(KUSTOMIZE)
437437
# Generate the base CRD/RBAC
438438
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=secretproviderclasses-role paths="./apis/..." paths="./controllers" output:crd:artifacts:config=config/crd/bases
439-
cp config/crd/bases/* manifest_staging/charts/secrets-store-csi-driver/templates
439+
cp config/crd/bases/* manifest_staging/charts/secrets-store-csi-driver/crds
440440
cp config/crd/bases/* manifest_staging/deploy/
441441

442442
# generate rbac-secretproviderclass

‎charts/index.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
apiVersion: v1
22
entries:
33
secrets-store-csi-driver:
4+
- apiVersion: v2
5+
appVersion: 0.1.0
6+
created: "2021-07-26T09:41:27.883002-07:00"
7+
description: A Helm chart to install the SecretsStore CSI Driver inside a Kubernetes
8+
cluster.
9+
digest: 4a8afc66ad5d9b42c3759213520da7024e966dbe0ab13a005f03fe32b10fac2e
10+
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
11+
kubeVersion: '>=1.16.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.1.0.tgz
20+
version: 0.1.0
421
- apiVersion: v1
522
appVersion: 0.0.23
623
created: "2021-06-10T12:27:24.468813-07:00"
@@ -256,4 +273,4 @@ entries:
256273
urls:
257274
- https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts/secrets-store-csi-driver-0.0.9.tgz
258275
version: 0.0.9
259-
generated: "2021-06-10T12:27:24.466683-07:00"
276+
generated: "2021-07-26T09:41:27.881293-07:00"

‎charts/secrets-store-csi-driver-0.1.0.tgz

8.48 KB
Binary file not shown.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
apiVersion: v1
1+
apiVersion: v2
22
name: secrets-store-csi-driver
3-
version: 0.0.23
4-
appVersion: 0.0.23
3+
version: 0.1.0
4+
appVersion: 0.1.0
55
kubeVersion: ">=1.16.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: 80 additions & 75 deletions
Large diffs are not rendered by default.

‎charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml renamed to ‎charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ spec:
4444
items:
4545
description: SecretObject defines the desired state of synced K8s secret objects
4646
properties:
47+
annotations:
48+
additionalProperties:
49+
type: string
50+
description: annotations of k8s secret object
51+
type: object
4752
data:
4853
items:
4954
description: SecretObjectData defines the desired state of synced K8s secret object data

‎charts/secrets-store-csi-driver/templates/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml renamed to ‎charts/secrets-store-csi-driver/crds/secrets-store.csi.x-k8s.io_secretproviderclasspodstatuses.yaml

File renamed without changes.

‎charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: {{ template "sscd.fullname" . }}-upgrade-crds
5+
{{ include "sscd.labels" . | indent 2 }}
6+
annotations:
7+
helm.sh/hook: pre-install,pre-upgrade
8+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
9+
helm.sh/hook-weight: "1"
10+
rules:
11+
- apiGroups: ["apiextensions.k8s.io"]
12+
resources: ["customresourcedefinitions"]
13+
verbs: ["get", "create", "update", "patch"]
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: ClusterRoleBinding
17+
metadata:
18+
name: {{ template "sscd.fullname" . }}-upgrade-crds
19+
{{ include "sscd.labels" . | indent 2 }}
20+
annotations:
21+
helm.sh/hook: pre-install,pre-upgrade
22+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
23+
helm.sh/hook-weight: "1"
24+
subjects:
25+
- kind: ServiceAccount
26+
name: {{ template "sscd.fullname" . }}-upgrade-crds
27+
namespace: {{ .Release.Namespace }}
28+
roleRef:
29+
kind: ClusterRole
30+
name: {{ template "sscd.fullname" . }}-upgrade-crds
31+
apiGroup: rbac.authorization.k8s.io
32+
---
33+
apiVersion: v1
34+
kind: ServiceAccount
35+
metadata:
36+
name: {{ template "sscd.fullname" . }}-upgrade-crds
37+
namespace: {{ .Release.Namespace }}
38+
{{ include "sscd.labels" . | indent 2 }}
39+
annotations:
40+
helm.sh/hook: pre-install,pre-upgrade
41+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
42+
helm.sh/hook-weight: "1"
43+
---
44+
apiVersion: batch/v1
45+
kind: Job
46+
metadata:
47+
name: {{ template "sscd.fullname" . }}-upgrade-crds
48+
namespace: {{ .Release.Namespace }}
49+
{{ include "sscd.labels" . | indent 2 }}
50+
annotations:
51+
helm.sh/hook: pre-upgrade
52+
helm.sh/hook-weight: "1"
53+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
54+
spec:
55+
backoffLimit: 0
56+
template:
57+
metadata:
58+
name: {{ template "sscd.fullname" . }}-upgrade-crds
59+
spec:
60+
serviceAccountName: {{ template "sscd.fullname" . }}-upgrade-crds
61+
restartPolicy: Never
62+
containers:
63+
- name: crds-upgrade
64+
image: "{{ .Values.linux.crds.image.repository }}:{{ .Values.linux.crds.image.tag }}"
65+
args:
66+
- apply
67+
- -f
68+
- crds/
69+
imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
70+
nodeSelector:
71+
kubernetes.io/os: linux

‎charts/secrets-store-csi-driver/templates/csidriver.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ metadata:
55
spec:
66
podInfoOnMount: true
77
attachRequired: false
8-
{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.Version }}
98
# Added in Kubernetes 1.16 with default mode of Persistent. Secrets store csi driver needs Ephermeral to be set.
109
volumeLifecycleModes:
1110
- Ephemeral
12-
{{ end }}

‎charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: {{ template "sscd.fullname" . }}-keep-crds
5+
{{ include "sscd.labels" . | indent 2 }}
6+
annotations:
7+
helm.sh/hook: pre-upgrade
8+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
9+
helm.sh/hook-weight: "2"
10+
rules:
11+
- apiGroups: ["apiextensions.k8s.io"]
12+
resources: ["customresourcedefinitions"]
13+
verbs: ["get", "patch"]
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: ClusterRoleBinding
17+
metadata:
18+
name: {{ template "sscd.fullname" . }}-keep-crds
19+
{{ include "sscd.labels" . | indent 2 }}
20+
annotations:
21+
helm.sh/hook: pre-upgrade
22+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
23+
helm.sh/hook-weight: "2"
24+
subjects:
25+
- kind: ServiceAccount
26+
name: {{ template "sscd.fullname" . }}-keep-crds
27+
namespace: {{ .Release.Namespace }}
28+
roleRef:
29+
kind: ClusterRole
30+
name: {{ template "sscd.fullname" . }}-keep-crds
31+
apiGroup: rbac.authorization.k8s.io
32+
---
33+
apiVersion: v1
34+
kind: ServiceAccount
35+
metadata:
36+
name: {{ template "sscd.fullname" . }}-keep-crds
37+
namespace: {{ .Release.Namespace }}
38+
{{ include "sscd.labels" . | indent 2 }}
39+
annotations:
40+
helm.sh/hook: pre-upgrade
41+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
42+
helm.sh/hook-weight: "2"
43+
---
44+
apiVersion: batch/v1
45+
kind: Job
46+
metadata:
47+
name: {{ template "sscd.fullname" . }}-keep-crds
48+
namespace: {{ .Release.Namespace }}
49+
{{ include "sscd.labels" . | indent 2 }}
50+
annotations:
51+
helm.sh/hook: pre-upgrade
52+
helm.sh/hook-weight: "2"
53+
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
54+
spec:
55+
backoffLimit: 0
56+
template:
57+
metadata:
58+
name: {{ template "sscd.fullname" . }}-keep-crds
59+
spec:
60+
serviceAccountName: {{ template "sscd.fullname" . }}-keep-crds
61+
restartPolicy: Never
62+
containers:
63+
- name: crds-keep
64+
image: "{{ .Values.linux.crds.image.repository }}:{{ .Values.linux.crds.image.tag }}"
65+
args:
66+
- patch
67+
- crd
68+
- secretproviderclasses.secrets-store.csi.x-k8s.io
69+
- secretproviderclasspodstatuses.secrets-store.csi.x-k8s.io
70+
- -p
71+
- '{"metadata":{"annotations": {"helm.sh/resource-policy": "keep"}}}'
72+
imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
73+
nodeSelector:
74+
kubernetes.io/os: linux

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ spec:
1717
{{ toYaml .Values.windows.updateStrategy | indent 4 }}
1818
template:
1919
metadata:
20-
{{- if .Values.windows.podAnnotations }}
2120
annotations:
2221
kubectl.kubernetes.io/default-logs-container: secrets-store
22+
{{- if .Values.windows.podAnnotations }}
2323
{{ toYaml .Values.windows.podAnnotations | indent 8 }}
24-
{{- end }}
24+
{{- end }}
2525
{{ include "sscd.labels" . | indent 6 }}
2626
{{- if .Values.windows.podLabels }}
2727
{{- toYaml .Values.windows.podLabels | nindent 8 }}
@@ -103,8 +103,6 @@ spec:
103103
apiVersion: v1
104104
fieldPath: spec.nodeName
105105
imagePullPolicy: {{ .Values.windows.image.pullPolicy }}
106-
securityContext:
107-
privileged: true
108106
{{- if semverCompare ">= v0.0.9-0" .Values.windows.image.tag }}
109107
ports:
110108
- containerPort: {{ .Values.livenessProbe.port }}
@@ -124,7 +122,6 @@ spec:
124122
mountPath: C:\csi
125123
- name: mountpoint-dir
126124
mountPath: {{ .Values.windows.kubeletRootDir }}\pods
127-
mountPropagation: Bidirectional
128125
- name: providers-dir
129126
mountPath: C:\k\secrets-store-csi-providers
130127
{{- if .Values.windows.volumeMounts }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ spec:
1717
{{ toYaml .Values.linux.updateStrategy | indent 4 }}
1818
template:
1919
metadata:
20-
{{- if .Values.linux.podAnnotations }}
2120
annotations:
2221
kubectl.kubernetes.io/default-logs-container: secrets-store
22+
{{- if .Values.linux.podAnnotations }}
2323
{{ toYaml .Values.linux.podAnnotations | indent 8 }}
24-
{{- end }}
24+
{{- end }}
2525
{{ include "sscd.labels" . | indent 6 }}
2626
{{- if .Values.linux.podLabels }}
2727
{{- toYaml .Values.linux.podLabels | nindent 8 }}

‎charts/secrets-store-csi-driver/values.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ linux:
22
enabled: true
33
image:
44
repository: k8s.gcr.io/csi-secrets-store/driver
5-
tag: v0.0.23
5+
tag: v0.1.0
66
pullPolicy: IfNotPresent
7+
8+
crds:
9+
image:
10+
repository: k8s.gcr.io/csi-secrets-store/driver-crds
11+
tag: v0.1.0
12+
pullPolicy: IfNotPresent
713

814
## Prevent the CSI driver from being scheduled on virtual-kublet nodes
915
affinity:
@@ -86,7 +92,7 @@ windows:
8692
enabled: false
8793
image:
8894
repository: k8s.gcr.io/csi-secrets-store/driver
89-
tag: v0.0.23
95+
tag: v0.1.0
9096
pullPolicy: IfNotPresent
9197

9298
## Prevent the CSI driver from being scheduled on virtual-kublet nodes
@@ -194,7 +200,7 @@ enableSecretRotation: false
194200
rotationPollInterval:
195201

196202
## Filtered watch nodePublishSecretRef secrets
197-
filteredWatchSecret: false
203+
filteredWatchSecret: true
198204

199205
## Provider HealthCheck
200206
providerHealthCheck: false

‎config/crd/bases/secrets-store.csi.x-k8s.io_secretproviderclasses.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ spec:
4444
items:
4545
description: SecretObject defines the desired state of synced K8s secret objects
4646
properties:
47+
annotations:
48+
additionalProperties:
49+
type: string
50+
description: annotations of k8s secret object
51+
type: object
4752
data:
4853
items:
4954
description: SecretObjectData defines the desired state of synced K8s secret object data
@@ -61,11 +66,6 @@ spec:
6166
type: string
6267
description: labels of K8s secret object
6368
type: object
64-
annotations:
65-
additionalProperties:
66-
type: string
67-
description: annotations of K8s secret object
68-
type: object
6969
secretName:
7070
description: name of the K8s secret object
7171
type: string

‎deploy/secrets-store-csi-driver-windows.yaml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ spec:
4242
cpu: 10m
4343
memory: 20Mi
4444
- name: secrets-store
45-
image: k8s.gcr.io/csi-secrets-store/driver:v0.0.23
45+
image: k8s.gcr.io/csi-secrets-store/driver:v0.1.0
4646
args:
4747
- "--endpoint=$(CSI_ENDPOINT)"
4848
- "--nodeid=$(KUBE_NODE_NAME)"
4949
- "--provider-volume=C:\\k\\secrets-store-csi-providers"
5050
- "--metrics-addr=:8095"
5151
- "--enable-secret-rotation=false"
5252
- "--rotation-poll-interval=2m"
53-
- "--filtered-watch-secret=false"
53+
- "--filtered-watch-secret=true"
5454
- "--provider-health-check=false"
5555
- "--provider-health-check-interval=2m"
5656
env:
@@ -62,20 +62,18 @@ spec:
6262
apiVersion: v1
6363
fieldPath: spec.nodeName
6464
imagePullPolicy: IfNotPresent
65-
securityContext:
66-
privileged: true
6765
ports:
6866
- containerPort: 9808
6967
name: healthz
7068
protocol: TCP
7169
livenessProbe:
72-
failureThreshold: 5
73-
httpGet:
74-
path: /healthz
75-
port: healthz
76-
initialDelaySeconds: 30
77-
timeoutSeconds: 10
78-
periodSeconds: 15
70+
failureThreshold: 5
71+
httpGet:
72+
path: /healthz
73+
port: healthz
74+
initialDelaySeconds: 30
75+
timeoutSeconds: 10
76+
periodSeconds: 15
7977
resources:
8078
limits:
8179
cpu: 400m
@@ -88,17 +86,16 @@ spec:
8886
mountPath: C:\csi
8987
- name: mountpoint-dir
9088
mountPath: "C:\\var\\lib\\kubelet\\pods"
91-
mountPropagation: Bidirectional
9289
- name: providers-dir
9390
mountPath: C:\k\secrets-store-csi-providers
9491
- name: liveness-probe
9592
image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
9693
imagePullPolicy: IfNotPresent
9794
args:
98-
- "--csi-address=unix://C:\\csi\\csi.sock"
99-
- --probe-timeout=3s
100-
- --http-endpoint=0.0.0.0:9808
101-
- -v=2
95+
- "--csi-address=unix://C:\\csi\\csi.sock"
96+
- --probe-timeout=3s
97+
- --http-endpoint=0.0.0.0:9808
98+
- -v=2
10299
volumeMounts:
103100
- name: plugin-dir
104101
mountPath: C:\csi

0 commit comments

Comments
 (0)