Skip to content

Commit b52ac9e

Browse files
committed
Support deploymentLabels
Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>
1 parent b34fc0d commit b52ac9e

5 files changed

Lines changed: 9 additions & 0 deletions

File tree

helm/oauth2-proxy/Chart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ annotations:
3232
artifacthub.io/changes: |
3333
- kind: added
3434
description: >
35+
Add deploymentLabels to allow setting deployment specific labels.
3536
Add tpl support for ingress.labels, ingress.extraPaths and nodeSelector. This is a
3637
behavior change: any values containing `{{ ... }}` will now be evaluated as templates.
3738
To keep literal `{{` sequences, escape them (for example, use `{{"{{"}}`).

helm/oauth2-proxy/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ The following table lists the configurable parameters of the oauth2-proxy chart
190190
| `config.google.useApplicationDefaultCredentials` | use the application-default credentials (i.e. Workload Identity on GKE) instead of providing a service account JSON | `false` |
191191
| `containerPort` | used to customize port on the deployment | `""` |
192192
| `customLabels` | Custom labels to add into metadata | `{}` |
193+
| `deploymentLabels` | labels to add to the deployment | `{}` |
193194
| `deploymentAnnotations` | annotations to add to the deployment | `{}` |
194195
| `enableServiceLinks` | configure deployment enableServiceLinks | `true` |
195196
| `extraArgs` | Extra arguments to give the binary. Either as a map with key:value pairs or as a list type, which allows the same flag to be configured multiple times. (e.g. `["--allowed-role=CLIENT_ID:CLIENT_ROLE_NAME_A", "--allowed-role=CLIENT_ID:CLIENT_ROLE_NAME_B"]`). | `{}` or `[]` |

helm/oauth2-proxy/ci/tpl-values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ config:
5757
test-annotations/test: "{{ $.Release.Name }}"
5858
cookieName: '{{ $.Release.Name }}'
5959

60+
deploymentLabels:
61+
test-deployment-label/test: "{{ $.Release.Name }}"
62+
6063
deploymentAnnotations:
6164
test-annotations/test: "{{ $.Release.Name }}"
6265

helm/oauth2-proxy/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ metadata:
66
labels:
77
app: {{ template "oauth2-proxy.name" . }}
88
{{- include "oauth2-proxy.labels" . | indent 4 }}
9+
{{- with .Values.deploymentLabels }}
10+
{{ tpl ( toYaml . ) $ | indent 4 }}
11+
{{- end }}
912
{{- with .Values.deploymentAnnotations }}
1013
annotations:
1114
{{ tpl ( toYaml . ) $ | indent 4 }}

helm/oauth2-proxy/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ securityContext:
475475
seccompProfile:
476476
type: RuntimeDefault
477477

478+
deploymentLabels: {}
478479
deploymentAnnotations: {}
479480
podAnnotations: {}
480481
podLabels: {}

0 commit comments

Comments
 (0)