Skip to content

Commit de650bf

Browse files
juan131juan131
authored
[bitnami/pinniped] Support for customizing standard labels (#18406)
1 parent 894eebb commit de650bf

23 files changed

+98
-272
lines changed

‎bitnami/pinniped/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 2.8.0
5-
digest: sha256:0119fce6b509ebf3eaf5218f87f6ec0af64ec7da15f272115673b0716c4b6919
6-
generated: "2023-08-10T03:07:59.002833468Z"
4+
version: 2.9.0
5+
digest: sha256:416ad278a896f0e9b51d5305bef5d875c7cca6fbb64b75e1f131b04763e2aff9
6+
generated: "2023-08-22T14:26:54.612823+02:00"

‎bitnami/pinniped/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ maintainers:
2727
name: pinniped
2828
sources:
2929
- https://github.com/bitnami/charts/tree/main/bitnami/pinniped
30-
version: 1.2.11
30+
version: 1.3.0

‎bitnami/pinniped/templates/concierge/apiservice-identity.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@ kind: APIService
99
metadata:
1010
name: v1alpha1.identity.concierge.pinniped.dev
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
1815
{{- if .Values.commonAnnotations }}
19-
annotations:
20-
{{- if .Values.commonAnnotations }}
21-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
22-
{{- end }}
16+
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2317
{{- end }}
2418
spec:
2519
version: v1alpha1

‎bitnami/pinniped/templates/concierge/apiservice-login.yaml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,11 @@ kind: APIService
99
metadata:
1010
name: v1alpha1.login.concierge.pinniped.dev
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
1815
{{- if .Values.commonAnnotations }}
19-
annotations:
20-
{{- if .Values.commonAnnotations }}
21-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
22-
{{- end }}
16+
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2317
{{- end }}
2418
spec:
2519
version: v1alpha1

‎bitnami/pinniped/templates/concierge/configmap.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ kind: ConfigMap
99
metadata:
1010
name: {{ template "pinniped.concierge.fullname" . }}
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
1815
{{- if .Values.commonAnnotations }}
1916
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2017
{{- end }}

‎bitnami/pinniped/templates/concierge/credential-issuer.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ kind: CredentialIssuer
99
metadata:
1010
name: {{ template "pinniped.concierge.fullname" . }}
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
1815
{{- if .Values.commonAnnotations }}
1916
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2017
{{- end }}

‎bitnami/pinniped/templates/concierge/deployment.yaml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ kind: Deployment
99
metadata:
1010
name: {{ template "pinniped.concierge.fullname" . }}
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
1815
{{- if .Values.commonAnnotations }}
1916
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
2017
{{- end }}
@@ -23,21 +20,19 @@ spec:
2320
{{- if .Values.concierge.updateStrategy }}
2421
strategy: {{- toYaml .Values.concierge.updateStrategy | nindent 4 }}
2522
{{- end }}
23+
{{- $podLabels := merge .Values.concierge.podLabels .Values.commonLabels }}
2624
selector:
27-
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
25+
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
2826
app.kubernetes.io/component: concierge
2927
template:
3028
metadata:
3129
annotations:
3230
{{- if .Values.concierge.podAnnotations }}
3331
{{- include "common.tplvalues.render" (dict "value" .Values.concierge.podAnnotations "context" $) | nindent 8 }}
3432
{{- end }}
35-
labels: {{- include "common.labels.standard" . | nindent 8 }}
33+
labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
3634
app: pinniped-concierge
3735
app.kubernetes.io/component: concierge
38-
{{- if .Values.concierge.podLabels }}
39-
{{- include "common.tplvalues.render" (dict "value" .Values.concierge.podLabels "context" $) | nindent 8 }}
40-
{{- end }}
4136
spec:
4237
serviceAccountName: {{ template "pinniped.concierge.serviceAccountName" . }}
4338
{{- include "pinniped.imagePullSecrets" . | nindent 6 }}
@@ -48,8 +43,8 @@ spec:
4843
affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.concierge.affinity "context" $) | nindent 8 }}
4944
{{- else }}
5045
affinity:
51-
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.concierge.podAffinityPreset "component" "concierge" "context" $) | nindent 10 }}
52-
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.concierge.podAntiAffinityPreset "component" "concierge" "context" $) | nindent 10 }}
46+
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.concierge.podAffinityPreset "component" "concierge" "customLabels" $podLabels "context" $) | nindent 10 }}
47+
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.concierge.podAntiAffinityPreset "component" "concierge" "customLabels" $podLabels "context" $) | nindent 10 }}
5348
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.concierge.nodeAffinityPreset.type "key" .Values.concierge.nodeAffinityPreset.key "values" .Values.concierge.nodeAffinityPreset.values) | nindent 10 }}
5449
{{- end }}
5550
{{- if .Values.concierge.nodeSelector }}

‎bitnami/pinniped/templates/concierge/impersonation-proxy-service-account.yaml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@ kind: ServiceAccount
99
metadata:
1010
name: {{ template "pinniped.concierge.impersonation-proxy.serviceAccountName" . }}
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
18-
annotations:
19-
{{- if .Values.commonAnnotations }}
20-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
21-
{{- end }}
22-
{{- if .Values.concierge.serviceAccount.impersonationProxy.annotations }}
23-
{{- include "common.tplvalues.render" ( dict "value" .Values.concierge.serviceAccount.impersonationProxy.annotations "context" $ ) | nindent 4 }}
24-
{{- end }}
15+
{{- if or .Values.concierge.serviceAccount.impersonationProxy.annotations .Values.commonAnnotations }}
16+
{{- $annotations := merge .Values.concierge.serviceAccount.impersonationProxy.annotations .Values.commonAnnotations }}
17+
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
18+
{{- end }}
2519
automountServiceAccountToken: {{ .Values.concierge.serviceAccount.impersonationProxy.automountServiceAccountToken }}
2620
secrets:
2721
- name: {{ template "pinniped.concierge.impersonation-proxy.fullname" . }}

‎bitnami/pinniped/templates/concierge/kube-cert-agent-service-account.yaml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ kind: ServiceAccount
99
metadata:
1010
name: {{ template "pinniped.concierge.kube-cert-agent.serviceAccountName" . }}
1111
namespace: {{ include "common.names.namespace" . | quote }}
12-
labels: {{- include "common.labels.standard" . | nindent 4 }}
12+
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
app.kubernetes.io/part-of: pinniped
1414
app.kubernetes.io/component: concierge
15-
{{- if .Values.commonLabels }}
16-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
17-
{{- end }}
18-
annotations:
19-
{{- if .Values.commonAnnotations }}
20-
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
21-
{{- end }}
22-
{{- if .Values.concierge.serviceAccount.kubeCertAgentService.annotations }}
23-
{{- include "common.tplvalues.render" ( dict "value" .Values.concierge.serviceAccount.kubeCertAgentService.annotations "context" $ ) | nindent 4 }}
24-
{{- end }}
15+
{{- if or .Values.concierge.serviceAccount.kubeCertAgentService.annotations .Values.commonAnnotations }}
16+
{{- $annotations := merge .Values.concierge.serviceAccount.kubeCertAgentService.annotations .Values.commonAnnotations }}
17+
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
18+
{{- end }}
2519
automountServiceAccountToken: {{ .Values.concierge.serviceAccount.kubeCertAgentService.automountServiceAccountToken }}
2620
{{- end }}

0 commit comments

Comments
 (0)