Skip to content

Commit 7f4aef9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1044 from nilekhc/automated-cherry-pick-of-#1043-upstream-release-1.2
Automated cherry pick of #1043: release: update manifest and helm charts for v1.2.4
2 parents eebfa99 + f7ff1b2 commit 7f4aef9

28 files changed

+98
-53
lines changed

‎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: v2
22
name: secrets-store-csi-driver
3-
version: 1.2.3
4-
appVersion: 1.2.3
3+
version: 1.2.4
4+
appVersion: 1.2.4
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ The following table lists the configurable parameters of the csi-secrets-store-p
2929
| Parameter | Description | Default |
3030
| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------- |
3131
| `nameOverride` | String to partially override secrets-store-csi-driver.fullname template with a string (will prepend the release name) | `""` |
32+
| `commonLabels` | Labels to apply to all resources | `""` |
3233
| `fullnameOverride` | String to fully override secrets-store-csi-driver.fullname template with a string | `""` |
3334
| `linux.image.repository` | Linux image repository | `k8s.gcr.io/csi-secrets-store/driver` |
3435
| `linux.image.pullPolicy` | Linux image pull policy | `IfNotPresent` |
35-
| `linux.image.tag` | Linux image tag | `v1.2.3` |
36+
| `linux.image.tag` | Linux image tag | `v1.2.4` |
3637
| `linux.crds.image.repository` | Linux crds image repository | `k8s.gcr.io/csi-secrets-store/driver-crds` |
3738
| `linux.crds.image.pullPolicy` | Linux crds image pull policy | `IfNotPresent` |
38-
| `linux.crds.image.tag` | Linux crds image tag | `v1.2.3` |
39+
| `linux.crds.image.tag` | Linux crds image tag | `v1.2.4` |
3940
| `linux.crds.podLabels` | Linux *Pod* labels appended to CRD helm hook job pods | `{}` |
4041
| `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
4142
| `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
@@ -66,7 +67,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
6667
| `linux.updateStrategy` | Configure a custom update strategy for the daemonset on linux nodes | `RollingUpdate with 1 maxUnavailable` |
6768
| `windows.image.repository` | Windows image repository | `k8s.gcr.io/csi-secrets-store/driver` |
6869
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
69-
| `windows.image.tag` | Windows image tag | `v1.2.3` |
70+
| `windows.image.tag` | Windows image tag | `v1.2.4` |
7071
| `windows.affinity` | Windows affinity | `key: type; operator: NotIn; values: [virtual-kubelet]` |
7172
| `windows.driver.resources` | The resource request/limits for the windows secrets-store container image | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
7273
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ If release name contains chart name it will be used as a full name.
2828
Standard labels for helm resources
2929
*/}}
3030
{{- define "sscd.labels" -}}
31-
labels:
32-
app.kubernetes.io/instance: "{{ .Release.Name }}"
33-
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
34-
app.kubernetes.io/name: "{{ template "sscd.name" . }}"
35-
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
36-
app: {{ template "sscd.name" . }}
37-
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
31+
app.kubernetes.io/instance: "{{ .Release.Name }}"
32+
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
33+
app.kubernetes.io/name: "{{ template "sscd.name" . }}"
34+
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
35+
app: {{ template "sscd.name" . }}
36+
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
37+
{{- if .Values.commonLabels}}
38+
{{ toYaml .Values.commonLabels }}
39+
{{- end }}
3840
{{- end -}}
3941

4042
{{- define "sscd-psp.fullname" -}}

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ template "sscd.fullname" . }}-upgrade-crds
5-
{{ include "sscd.labels" . | indent 2 }}
5+
labels:
6+
{{ include "sscd.labels" . | indent 4 }}
67
annotations:
78
helm.sh/hook: pre-install,pre-upgrade
89
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -11,7 +12,7 @@ rules:
1112
- apiGroups: ["apiextensions.k8s.io"]
1213
resources: ["customresourcedefinitions"]
1314
verbs: ["get", "create", "update", "patch"]
14-
{{- if .Values.rbac.pspEnabled }}
15+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
1516
- apiGroups: ['policy']
1617
resources: ['podsecuritypolicies']
1718
verbs: ['use']
@@ -23,7 +24,8 @@ apiVersion: rbac.authorization.k8s.io/v1
2324
kind: ClusterRoleBinding
2425
metadata:
2526
name: {{ template "sscd.fullname" . }}-upgrade-crds
26-
{{ include "sscd.labels" . | indent 2 }}
27+
labels:
28+
{{ include "sscd.labels" . | indent 4 }}
2729
annotations:
2830
helm.sh/hook: pre-install,pre-upgrade
2931
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -37,11 +39,13 @@ roleRef:
3739
name: {{ template "sscd.fullname" . }}-upgrade-crds
3840
apiGroup: rbac.authorization.k8s.io
3941
---
40-
{{- if .Values.rbac.pspEnabled }}
42+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
4143
apiVersion: policy/v1beta1
4244
kind: PodSecurityPolicy
4345
metadata:
4446
name: allow-upgrade-crds
47+
labels:
48+
{{ include "sscd.labels" . | indent 4 }}
4549
annotations:
4650
helm.sh/hook: pre-install,pre-upgrade
4751
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -64,7 +68,8 @@ kind: ServiceAccount
6468
metadata:
6569
name: {{ template "sscd.fullname" . }}-upgrade-crds
6670
namespace: {{ .Release.Namespace }}
67-
{{ include "sscd.labels" . | indent 2 }}
71+
labels:
72+
{{ include "sscd.labels" . | indent 4 }}
6873
annotations:
6974
helm.sh/hook: pre-install,pre-upgrade
7075
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -75,7 +80,8 @@ kind: Job
7580
metadata:
7681
name: secrets-store-csi-driver-upgrade-crds
7782
namespace: {{ .Release.Namespace }}
78-
{{ include "sscd.labels" . | indent 2 }}
83+
labels:
84+
{{ include "sscd.labels" . | indent 4 }}
7985
annotations:
8086
helm.sh/hook: pre-install,pre-upgrade
8187
helm.sh/hook-weight: "10"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: {{ template "csidriver.apiVersion" . }}
22
kind: CSIDriver
33
metadata:
44
name: secrets-store.csi.k8s.io
5+
labels:
6+
{{ include "sscd.labels" . | indent 4 }}
57
spec:
68
podInfoOnMount: true
79
attachRequired: false

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: {{ template "sscd.fullname" . }}-keep-crds
5-
{{ include "sscd.labels" . | indent 2 }}
5+
labels:
6+
{{ include "sscd.labels" . | indent 4 }}
67
annotations:
78
helm.sh/hook: pre-upgrade
89
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -11,7 +12,7 @@ rules:
1112
- apiGroups: ["apiextensions.k8s.io"]
1213
resources: ["customresourcedefinitions"]
1314
verbs: ["get", "patch"]
14-
{{- if .Values.rbac.pspEnabled }}
15+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
1516
- apiGroups: ['policy']
1617
resources: ['podsecuritypolicies']
1718
verbs: ['use']
@@ -23,7 +24,8 @@ apiVersion: rbac.authorization.k8s.io/v1
2324
kind: ClusterRoleBinding
2425
metadata:
2526
name: {{ template "sscd.fullname" . }}-keep-crds
26-
{{ include "sscd.labels" . | indent 2 }}
27+
labels:
28+
{{ include "sscd.labels" . | indent 4 }}
2729
annotations:
2830
helm.sh/hook: pre-upgrade
2931
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -37,11 +39,13 @@ roleRef:
3739
name: {{ template "sscd.fullname" . }}-keep-crds
3840
apiGroup: rbac.authorization.k8s.io
3941
---
40-
{{- if .Values.rbac.pspEnabled }}
42+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
4143
apiVersion: policy/v1beta1
4244
kind: PodSecurityPolicy
4345
metadata:
4446
name: allow-keep-crds
47+
labels:
48+
{{ include "sscd.labels" . | indent 4 }}
4549
annotations:
4650
helm.sh/hook: pre-upgrade
4751
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -64,7 +68,8 @@ kind: ServiceAccount
6468
metadata:
6569
name: {{ template "sscd.fullname" . }}-keep-crds
6670
namespace: {{ .Release.Namespace }}
67-
{{ include "sscd.labels" . | indent 2 }}
71+
labels:
72+
{{ include "sscd.labels" . | indent 4 }}
6873
annotations:
6974
helm.sh/hook: pre-upgrade
7075
helm.sh/hook-delete-policy: "hook-succeeded,before-hook-creation"
@@ -75,7 +80,8 @@ kind: Job
7580
metadata:
7681
name: secrets-store-csi-driver-keep-crds
7782
namespace: {{ .Release.Namespace }}
78-
{{ include "sscd.labels" . | indent 2 }}
83+
labels:
84+
{{ include "sscd.labels" . | indent 4 }}
7985
annotations:
8086
helm.sh/hook: pre-upgrade
8187
helm.sh/hook-weight: "20"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
{{- if .Values.rbac.pspEnabled }}
1+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
22
apiVersion: policy/v1beta1
33
kind: PodSecurityPolicy
44
metadata:
55
name: {{ template "sscd-psp.fullname" . }}
6-
{{ include "sscd.labels" . | indent 2 }}
6+
labels:
7+
{{ include "sscd.labels" . | indent 4 }}
78
spec:
89
seLinux:
910
rule: RunAsAny

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ kind: ClusterRole
55
metadata:
66
creationTimestamp: null
77
name: secretproviderrotation-role
8+
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
810
rules:
911
- apiGroups:
1012
- ""

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: secretproviderrotation-rolebinding
6+
labels:
7+
{{ include "sscd.labels" . | indent 4 }}
68
roleRef:
79
apiGroup: rbac.authorization.k8s.io
810
kind: ClusterRole

‎charts/secrets-store-csi-driver/templates/role-secretproviderclasses-admin.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ kind: ClusterRole
66
metadata:
77
creationTimestamp: null
88
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
910
rbac.authorization.k8s.io/aggregate-to-admin: "true"
1011
rbac.authorization.k8s.io/aggregate-to-edit: "true"
1112
name: secretproviderclasses-admin-role

‎charts/secrets-store-csi-driver/templates/role-secretproviderclasses-viewer.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ kind: ClusterRole
66
metadata:
77
creationTimestamp: null
88
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
910
rbac.authorization.k8s.io/aggregate-to-view: "true"
1011
name: secretproviderclasses-viewer-role
1112
rules:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ kind: ClusterRole
55
metadata:
66
creationTimestamp: null
77
name: secretprovidersyncing-role
8+
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
810
rules:
911
- apiGroups:
1012
- ""

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: secretprovidersyncing-rolebinding
6+
labels:
7+
{{ include "sscd.labels" . | indent 4 }}
68
roleRef:
79
apiGroup: rbac.authorization.k8s.io
810
kind: ClusterRole

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ kind: ClusterRole
55
metadata:
66
creationTimestamp: null
77
name: secretprovidertokenrequest-role
8+
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
810
rules:
911
- apiGroups:
1012
- ""

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: secretprovidertokenrequest-rolebinding
6+
labels:
7+
{{ include "sscd.labels" . | indent 4 }}
68
roleRef:
79
apiGroup: rbac.authorization.k8s.io
810
kind: ClusterRole

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ kind: ClusterRole
55
metadata:
66
creationTimestamp: null
77
name: secretproviderclasses-role
8+
labels:
9+
{{ include "sscd.labels" . | indent 4 }}
810
rules:
911
- apiGroups:
1012
- ""
@@ -59,7 +61,7 @@ rules:
5961
- get
6062
- list
6163
- watch
62-
{{- if .Values.rbac.pspEnabled }}
64+
{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
6365
- apiGroups:
6466
- policy
6567
resources:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: secretproviderclasses-rolebinding
6+
labels:
7+
{{ include "sscd.labels" . | indent 4 }}
68
roleRef:
79
apiGroup: rbac.authorization.k8s.io
810
kind: ClusterRole

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apiVersion: apps/v1
44
metadata:
55
name: {{ template "sscd.fullname" . }}-windows
66
namespace: {{ .Release.Namespace }}
7-
{{ include "sscd.labels" . | indent 2 }}
7+
labels:
8+
{{ include "sscd.labels" . | indent 4 }}
89
{{- if .Values.windows.daemonsetAnnotations }}
910
annotations:
1011
{{ toYaml .Values.windows.daemonsetAnnotations | indent 4 }}
@@ -17,14 +18,15 @@ spec:
1718
{{ toYaml .Values.windows.updateStrategy | indent 4 }}
1819
template:
1920
metadata:
21+
labels:
22+
{{ include "sscd.labels" . | indent 8 }}
23+
{{- if .Values.windows.podLabels }}
24+
{{- toYaml .Values.windows.podLabels | nindent 8 }}
25+
{{- end }}
2026
annotations:
2127
kubectl.kubernetes.io/default-container: secrets-store
2228
{{- if .Values.windows.podAnnotations }}
2329
{{ toYaml .Values.windows.podAnnotations | indent 8 }}
24-
{{- end }}
25-
{{ include "sscd.labels" . | indent 6 }}
26-
{{- if .Values.windows.podLabels }}
27-
{{- toYaml .Values.windows.podLabels | nindent 8 }}
2830
{{- end }}
2931
spec:
3032
serviceAccountName: secrets-store-csi-driver

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ apiVersion: apps/v1
44
metadata:
55
name: {{ template "sscd.fullname" . }}
66
namespace: {{ .Release.Namespace }}
7-
{{ include "sscd.labels" . | indent 2 }}
7+
labels:
8+
{{ include "sscd.labels" . | indent 4 }}
89
{{- if .Values.linux.daemonsetAnnotations }}
910
annotations:
1011
{{ toYaml .Values.linux.daemonsetAnnotations | indent 4 }}
@@ -18,13 +19,14 @@ spec:
1819
template:
1920
metadata:
2021
annotations:
22+
labels:
23+
{{ include "sscd.labels" . | indent 8 }}
24+
{{- if .Values.linux.podLabels }}
25+
{{- toYaml .Values.linux.podLabels | nindent 8 }}
26+
{{- end }}
2127
kubectl.kubernetes.io/default-container: secrets-store
2228
{{- if .Values.linux.podAnnotations }}
2329
{{ toYaml .Values.linux.podAnnotations | indent 8 }}
24-
{{- end }}
25-
{{ include "sscd.labels" . | indent 6 }}
26-
{{- if .Values.linux.podLabels }}
27-
{{- toYaml .Values.linux.podLabels | nindent 8 }}
2830
{{- end }}
2931
spec:
3032
serviceAccountName: secrets-store-csi-driver

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ kind: ServiceAccount
44
metadata:
55
name: secrets-store-csi-driver
66
namespace: {{ .Release.Namespace }}
7-
{{ include "sscd.labels" . | indent 2 }}
7+
labels:
8+
{{ include "sscd.labels" . | indent 4 }}
89
{{ end }}

0 commit comments

Comments
 (0)