Skip to content

Commit 5e2233c

Browse files
mohamed-essammohamed-essam
authored
add commonLabels to customizable values (#1404)
**Description of the change** Helm Chart only update, add new value `commonLabels` that functions the same as `commonAnnotations` by adding labels to `_helpers.tpl` in `sealed-secrets.labels` **Benefits** * Ability to add custom labels to all resources for any organization compliance **Possible drawbacks** N/A **Applicable issues** - fixes #1373 **Additional information** My current organization requires adding a custom label to all resources, thus the PR. The changes in the PR were tested on a local Kubernetes installation with both `commonLabels: {}` and `commonLabels: {x: 'y'}` --------- Signed-off-by: M Essam Hamed <github@messam.xyz>
1 parent f7196bb commit 5e2233c

18 files changed

+66
-0
lines changed

‎helm/sealed-secrets/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ The command removes all the Kubernetes components associated with the chart and
7878
| `namespace` | Namespace where to deploy the Sealed Secrets controller | `""` |
7979
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` |
8080
| `commonAnnotations` | Annotations to add to all deployed resources | `{}` |
81+
| `commonLabels` | Labels to add to all deployed resources | `{}` |
8182

8283
### Sealed Secrets Parameters
8384

‎helm/sealed-secrets/templates/cluster-role-binding.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
{{- if .Values.rbac.labels }}
88
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
99
{{- end }}
10+
{{- if .Values.commonLabels }}
11+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
12+
{{- end }}
1013
roleRef:
1114
apiGroup: rbac.authorization.k8s.io
1215
kind: ClusterRole

‎helm/sealed-secrets/templates/cluster-role.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
{{- if .Values.rbac.labels }}
88
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
99
{{- end }}
10+
{{- if .Values.commonLabels }}
11+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
12+
{{- end }}
1013
rules:
1114
- apiGroups:
1215
- bitnami.com

‎helm/sealed-secrets/templates/configmap-dashboards.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ metadata:
1111
{{- if $.Values.metrics.dashboards.labels }}
1212
{{- include "sealed-secrets.render" ( dict "value" $.Values.metrics.dashboards.labels "context" $) | nindent 4 }}
1313
{{- end }}
14+
{{- if .Values.commonLabels }}
15+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
16+
{{- end }}
1417
annotations:
1518
{{- if $.Values.metrics.dashboards.annotations }}
1619
{{- include "sealed-secrets.render" ( dict "value" $.Values.metrics.dashboards.annotations "context" $) | nindent 4 }}

‎helm/sealed-secrets/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: {{ include "sealed-secrets.fullname" . }}
66
namespace: {{ include "sealed-secrets.namespace" . }}
77
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
8+
{{- if .Values.commonLabels }}
9+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
10+
{{- end }}
811
{{- if .Values.commonAnnotations }}
912
annotations: {{- toYaml .Values.commonAnnotations | nindent 4 }}
1013
{{- end }}

‎helm/sealed-secrets/templates/ingress.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: {{ include "sealed-secrets.fullname" . }}
66
namespace: {{ include "sealed-secrets.namespace" . }}
77
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
8+
{{- if .Values.commonLabels }}
9+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
10+
{{- end }}
811
{{- if .Values.ingress.annotations }}
912
annotations:
1013
{{- if .Values.ingress.annotations }}

‎helm/sealed-secrets/templates/networkpolicy.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: {{ include "sealed-secrets.fullname" . }}
66
namespace: {{ include "sealed-secrets.namespace" . }}
77
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
8+
{{- if .Values.commonLabels }}
9+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
10+
{{- end }}
811
spec:
912
podSelector:
1013
matchLabels: {{- include "sealed-secrets.matchLabels" . | nindent 6 }}

‎helm/sealed-secrets/templates/pdb.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: {{ include "sealed-secrets.fullname" . }}
66
namespace: {{ include "sealed-secrets.namespace" . }}
77
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
8+
{{- if .Values.commonLabels }}
9+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
10+
{{- end }}
811
{{- if .Values.commonAnnotations }}
912
annotations: {{- toYaml .Values.commonAnnotations | nindent 4 }}
1013
{{- end }}

‎helm/sealed-secrets/templates/psp-clusterrole.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
{{- if .Values.rbac.labels }}
88
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
99
{{- end }}
10+
{{- if .Values.commonLabels }}
11+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
12+
{{- end }}
1013
rules:
1114
- apiGroups: ['extensions']
1215
resources: ['podsecuritypolicies']

‎helm/sealed-secrets/templates/psp-clusterrolebinding.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
{{- if .Values.rbac.labels }}
88
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
99
{{- end }}
10+
{{- if .Values.commonLabels }}
11+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
12+
{{- end }}
1013
roleRef:
1114
apiGroup: rbac.authorization.k8s.io
1215
kind: ClusterRole

‎helm/sealed-secrets/templates/psp.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ kind: PodSecurityPolicy
44
metadata:
55
name: {{ include "sealed-secrets.fullname" . }}
66
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
7+
{{- if .Values.commonLabels }}
8+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
9+
{{- end }}
710
spec:
811
privileged: false
912
allowPrivilegeEscalation: false

‎helm/sealed-secrets/templates/role-binding.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
{{- if .Values.rbac.labels }}
99
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
1010
{{- end }}
11+
{{- if .Values.commonLabels }}
12+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
13+
{{- end }}
1114
roleRef:
1215
apiGroup: rbac.authorization.k8s.io
1316
kind: Role
@@ -27,6 +30,9 @@ metadata:
2730
{{- if .Values.rbac.labels }}
2831
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
2932
{{- end }}
33+
{{- if .Values.commonLabels }}
34+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
35+
{{- end }}
3036
roleRef:
3137
apiGroup: rbac.authorization.k8s.io
3238
kind: Role

‎helm/sealed-secrets/templates/role.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
{{- if .Values.rbac.labels }}
99
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
1010
{{- end }}
11+
{{- if .Values.commonLabels }}
12+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
13+
{{- end }}
1114
rules:
1215
- apiGroups:
1316
- ""
@@ -34,6 +37,9 @@ metadata:
3437
{{- if .Values.rbac.labels }}
3538
{{- include "sealed-secrets.render" ( dict "value" .Values.rbac.labels "context" $) | nindent 4 }}
3639
{{- end }}
40+
{{- if .Values.commonLabels }}
41+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
42+
{{- end }}
3743
rules:
3844
- apiGroups:
3945
- ""

‎helm/sealed-secrets/templates/service-account.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ metadata:
1717
{{- if .Values.serviceAccount.labels }}
1818
{{- include "sealed-secrets.render" ( dict "value" .Values.serviceAccount.labels "context" $) | nindent 4 }}
1919
{{- end }}
20+
{{- if .Values.commonLabels }}
21+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
22+
{{- end }}
2023
{{ end }}

‎helm/sealed-secrets/templates/service.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ metadata:
1717
{{- if .Values.service.labels }}
1818
{{- include "sealed-secrets.render" ( dict "value" .Values.service.labels "context" $) | nindent 4 }}
1919
{{- end }}
20+
{{- if .Values.commonLabels }}
21+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
22+
{{- end }}
2023
spec:
2124
type: {{ .Values.service.type }}
2225
ports:
@@ -48,6 +51,9 @@ metadata:
4851
{{- if .Values.metrics.service.labels }}
4952
{{- include "sealed-secrets.render" ( dict "value" .Values.metrics.service.labels "context" $) | nindent 4 }}
5053
{{- end }}
54+
{{- if .Values.commonLabels }}
55+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
56+
{{- end }}
5157
spec:
5258
type: {{ .Values.metrics.service.type }}
5359
ports:

‎helm/sealed-secrets/templates/servicemonitor.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ metadata:
1212
{{- if .Values.metrics.serviceMonitor.labels }}
1313
{{- include "sealed-secrets.render" ( dict "value" .Values.metrics.serviceMonitor.labels "context" $) | nindent 4 }}
1414
{{- end }}
15+
{{- if .Values.commonLabels }}
16+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
17+
{{- end }}
1518
{{- if .Values.metrics.serviceMonitor.annotations }}
1619
annotations: {{- include "sealed-secrets.render" (dict "value" .Values.metrics.serviceMonitor.annotations "context" $) | nindent 4 }}
1720
{{- end }}

‎helm/sealed-secrets/templates/tls-secret.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
name: {{ .name }}
88
namespace: {{ include "sealed-secrets.namespace" $ | quote }}
99
labels: {{- include "sealed-secrets.labels" $ | nindent 4 }}
10+
{{- if .Values.commonLabels }}
11+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
12+
{{- end }}
1013
type: kubernetes.io/tls
1114
data:
1215
tls.crt: {{ .certificate | b64enc }}
@@ -23,6 +26,9 @@ metadata:
2326
name: {{ printf "%s-tls" .Values.ingress.hostname }}
2427
namespace: {{ include "sealed-secrets.namespace" . }}
2528
labels: {{- include "sealed-secrets.labels" . | nindent 4 }}
29+
{{- if .Values.commonLabels }}
30+
{{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
31+
{{- end }}
2632
type: kubernetes.io/tls
2733
data:
2834
tls.crt: {{ $cert.Cert | b64enc | quote }}

‎helm/sealed-secrets/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ extraDeploy: []
2121
##
2222
commonAnnotations: {}
2323

24+
## @param commonLabels [ojbect] Labels to add to all deployed resources
25+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
26+
##
27+
commonLabels: {}
28+
2429
## @section Sealed Secrets Parameters
2530

2631
## Sealed Secrets image

0 commit comments

Comments
 (0)