Skip to content

Commit db2982b

Browse files
author
Kautilya Tripathi
authored
Merge pull request #2789 from headlamp-k8s/helm-ingress-labels
charts: Add support for custom ingress labels
2 parents 5d78706 + a64c8dc commit db2982b

File tree

11 files changed

+83
-71
lines changed

11 files changed

+83
-71
lines changed

‎charts/headlamp/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ config:
173173
| ingress.enabled | bool | `false` | Enable ingress |
174174
| ingress.className | string | `""` | Ingress class name |
175175
| ingress.annotations | object | `{}` | Ingress annotations (e.g., kubernetes.io/tls-acme: "true") |
176+
| ingress.labels | object | `{}` | Additional labels for the Ingress resource |
176177
| ingress.hosts | list | `[]` | Ingress hosts configuration |
177178
| ingress.tls | list | `[]` | Ingress TLS configuration |
178179

@@ -182,6 +183,9 @@ ingress:
182183
enabled: true
183184
annotations:
184185
kubernetes.io/tls-acme: "true"
186+
labels:
187+
app.kubernetes.io/part-of: traefik
188+
environment: prod
185189
hosts:
186190
- host: headlamp.example.com
187191
paths:

‎charts/headlamp/templates/ingress.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ metadata:
1111
name: {{ $fullName }}
1212
labels:
1313
{{- include "headlamp.labels" . | nindent 4 }}
14+
{{- with .Values.ingress.labels }}
15+
{{- toYaml . | nindent 4 }}
16+
{{- end }}
1417
{{- with .Values.ingress.annotations }}
1518
annotations:
1619
{{- toYaml . | nindent 4 }}

‎charts/headlamp/tests/expected_templates/default.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.20.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.23.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/secret.yaml
@@ -25,10 +25,10 @@ kind: ClusterRoleBinding
2525
metadata:
2626
name: headlamp-admin
2727
labels:
28-
helm.sh/chart: headlamp-0.20.0
28+
helm.sh/chart: headlamp-0.28.0
2929
app.kubernetes.io/name: headlamp
3030
app.kubernetes.io/instance: headlamp
31-
app.kubernetes.io/version: "0.23.1"
31+
app.kubernetes.io/version: "0.28.0"
3232
app.kubernetes.io/managed-by: Helm
3333
roleRef:
3434
apiGroup: rbac.authorization.k8s.io
@@ -45,10 +45,10 @@ kind: Service
4545
metadata:
4646
name: headlamp
4747
labels:
48-
helm.sh/chart: headlamp-0.20.0
48+
helm.sh/chart: headlamp-0.28.0
4949
app.kubernetes.io/name: headlamp
5050
app.kubernetes.io/instance: headlamp
51-
app.kubernetes.io/version: "0.23.1"
51+
app.kubernetes.io/version: "0.28.0"
5252
app.kubernetes.io/managed-by: Helm
5353
spec:
5454
type: ClusterIP
@@ -67,10 +67,10 @@ kind: Deployment
6767
metadata:
6868
name: headlamp
6969
labels:
70-
helm.sh/chart: headlamp-0.20.0
70+
helm.sh/chart: headlamp-0.28.0
7171
app.kubernetes.io/name: headlamp
7272
app.kubernetes.io/instance: headlamp
73-
app.kubernetes.io/version: "0.23.1"
73+
app.kubernetes.io/version: "0.28.0"
7474
app.kubernetes.io/managed-by: Helm
7575
spec:
7676
replicas: 1

‎charts/headlamp/tests/expected_templates/extra-args.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.25.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.25.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/secret.yaml
@@ -25,10 +25,10 @@ kind: ClusterRoleBinding
2525
metadata:
2626
name: headlamp-admin
2727
labels:
28-
helm.sh/chart: headlamp-0.25.0
28+
helm.sh/chart: headlamp-0.28.0
2929
app.kubernetes.io/name: headlamp
3030
app.kubernetes.io/instance: headlamp
31-
app.kubernetes.io/version: "0.25.1"
31+
app.kubernetes.io/version: "0.28.0"
3232
app.kubernetes.io/managed-by: Helm
3333
roleRef:
3434
apiGroup: rbac.authorization.k8s.io
@@ -45,10 +45,10 @@ kind: Service
4545
metadata:
4646
name: headlamp
4747
labels:
48-
helm.sh/chart: headlamp-0.25.0
48+
helm.sh/chart: headlamp-0.28.0
4949
app.kubernetes.io/name: headlamp
5050
app.kubernetes.io/instance: headlamp
51-
app.kubernetes.io/version: "0.25.1"
51+
app.kubernetes.io/version: "0.28.0"
5252
app.kubernetes.io/managed-by: Helm
5353
spec:
5454
type: ClusterIP
@@ -70,10 +70,10 @@ kind: Deployment
7070
metadata:
7171
name: headlamp
7272
labels:
73-
helm.sh/chart: headlamp-0.25.0
73+
helm.sh/chart: headlamp-0.28.0
7474
app.kubernetes.io/name: headlamp
7575
app.kubernetes.io/instance: headlamp
76-
app.kubernetes.io/version: "0.25.1"
76+
app.kubernetes.io/version: "0.28.0"
7777
app.kubernetes.io/managed-by: Helm
7878
spec:
7979
replicas: 1
@@ -97,7 +97,7 @@ spec:
9797
runAsGroup: 101
9898
runAsNonRoot: true
9999
runAsUser: 100
100-
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
100+
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
101101
imagePullPolicy: IfNotPresent
102102

103103
env:

‎charts/headlamp/tests/expected_templates/extra-manifests.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.25.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.25.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/secret.yaml
@@ -42,10 +42,10 @@ kind: ClusterRoleBinding
4242
metadata:
4343
name: headlamp-admin
4444
labels:
45-
helm.sh/chart: headlamp-0.25.0
45+
helm.sh/chart: headlamp-0.28.0
4646
app.kubernetes.io/name: headlamp
4747
app.kubernetes.io/instance: headlamp
48-
app.kubernetes.io/version: "0.25.1"
48+
app.kubernetes.io/version: "0.28.0"
4949
app.kubernetes.io/managed-by: Helm
5050
roleRef:
5151
apiGroup: rbac.authorization.k8s.io
@@ -62,10 +62,10 @@ kind: Service
6262
metadata:
6363
name: headlamp
6464
labels:
65-
helm.sh/chart: headlamp-0.25.0
65+
helm.sh/chart: headlamp-0.28.0
6666
app.kubernetes.io/name: headlamp
6767
app.kubernetes.io/instance: headlamp
68-
app.kubernetes.io/version: "0.25.1"
68+
app.kubernetes.io/version: "0.28.0"
6969
app.kubernetes.io/managed-by: Helm
7070
spec:
7171
type: ClusterIP
@@ -87,10 +87,10 @@ kind: Deployment
8787
metadata:
8888
name: headlamp
8989
labels:
90-
helm.sh/chart: headlamp-0.25.0
90+
helm.sh/chart: headlamp-0.28.0
9191
app.kubernetes.io/name: headlamp
9292
app.kubernetes.io/instance: headlamp
93-
app.kubernetes.io/version: "0.25.1"
93+
app.kubernetes.io/version: "0.28.0"
9494
app.kubernetes.io/managed-by: Helm
9595
spec:
9696
replicas: 1
@@ -114,7 +114,7 @@ spec:
114114
runAsGroup: 101
115115
runAsNonRoot: true
116116
runAsUser: 100
117-
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
117+
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
118118
imagePullPolicy: IfNotPresent
119119

120120
env:

‎charts/headlamp/tests/expected_templates/oidc-create-secret.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.25.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.25.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/secret.yaml
@@ -29,10 +29,10 @@ kind: ClusterRoleBinding
2929
metadata:
3030
name: headlamp-admin
3131
labels:
32-
helm.sh/chart: headlamp-0.25.0
32+
helm.sh/chart: headlamp-0.28.0
3333
app.kubernetes.io/name: headlamp
3434
app.kubernetes.io/instance: headlamp
35-
app.kubernetes.io/version: "0.25.1"
35+
app.kubernetes.io/version: "0.28.0"
3636
app.kubernetes.io/managed-by: Helm
3737
roleRef:
3838
apiGroup: rbac.authorization.k8s.io
@@ -49,10 +49,10 @@ kind: Service
4949
metadata:
5050
name: headlamp
5151
labels:
52-
helm.sh/chart: headlamp-0.25.0
52+
helm.sh/chart: headlamp-0.28.0
5353
app.kubernetes.io/name: headlamp
5454
app.kubernetes.io/instance: headlamp
55-
app.kubernetes.io/version: "0.25.1"
55+
app.kubernetes.io/version: "0.28.0"
5656
app.kubernetes.io/managed-by: Helm
5757
spec:
5858
type: ClusterIP
@@ -74,10 +74,10 @@ kind: Deployment
7474
metadata:
7575
name: headlamp
7676
labels:
77-
helm.sh/chart: headlamp-0.25.0
77+
helm.sh/chart: headlamp-0.28.0
7878
app.kubernetes.io/name: headlamp
7979
app.kubernetes.io/instance: headlamp
80-
app.kubernetes.io/version: "0.25.1"
80+
app.kubernetes.io/version: "0.28.0"
8181
app.kubernetes.io/managed-by: Helm
8282
spec:
8383
replicas: 1
@@ -101,7 +101,7 @@ spec:
101101
runAsGroup: 101
102102
runAsNonRoot: true
103103
runAsUser: 100
104-
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
104+
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
105105
imagePullPolicy: IfNotPresent
106106

107107
env:

‎charts/headlamp/tests/expected_templates/oidc-directly-env.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.25.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.25.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/secret.yaml
@@ -25,10 +25,10 @@ kind: ClusterRoleBinding
2525
metadata:
2626
name: headlamp-admin
2727
labels:
28-
helm.sh/chart: headlamp-0.25.0
28+
helm.sh/chart: headlamp-0.28.0
2929
app.kubernetes.io/name: headlamp
3030
app.kubernetes.io/instance: headlamp
31-
app.kubernetes.io/version: "0.25.1"
31+
app.kubernetes.io/version: "0.28.0"
3232
app.kubernetes.io/managed-by: Helm
3333
roleRef:
3434
apiGroup: rbac.authorization.k8s.io
@@ -45,10 +45,10 @@ kind: Service
4545
metadata:
4646
name: headlamp
4747
labels:
48-
helm.sh/chart: headlamp-0.25.0
48+
helm.sh/chart: headlamp-0.28.0
4949
app.kubernetes.io/name: headlamp
5050
app.kubernetes.io/instance: headlamp
51-
app.kubernetes.io/version: "0.25.1"
51+
app.kubernetes.io/version: "0.28.0"
5252
app.kubernetes.io/managed-by: Helm
5353
spec:
5454
type: ClusterIP
@@ -70,10 +70,10 @@ kind: Deployment
7070
metadata:
7171
name: headlamp
7272
labels:
73-
helm.sh/chart: headlamp-0.25.0
73+
helm.sh/chart: headlamp-0.28.0
7474
app.kubernetes.io/name: headlamp
7575
app.kubernetes.io/instance: headlamp
76-
app.kubernetes.io/version: "0.25.1"
76+
app.kubernetes.io/version: "0.28.0"
7777
app.kubernetes.io/managed-by: Helm
7878
spec:
7979
replicas: 1
@@ -97,7 +97,7 @@ spec:
9797
runAsGroup: 101
9898
runAsNonRoot: true
9999
runAsUser: 100
100-
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
100+
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
101101
imagePullPolicy: IfNotPresent
102102

103103
env:

‎charts/headlamp/tests/expected_templates/oidc-directly.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ServiceAccount
55
metadata:
66
name: headlamp
77
labels:
8-
helm.sh/chart: headlamp-0.25.0
8+
helm.sh/chart: headlamp-0.28.0
99
app.kubernetes.io/name: headlamp
1010
app.kubernetes.io/instance: headlamp
11-
app.kubernetes.io/version: "0.25.1"
11+
app.kubernetes.io/version: "0.28.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: headlamp/templates/clusterrolebinding.yaml
@@ -17,10 +17,10 @@ kind: ClusterRoleBinding
1717
metadata:
1818
name: headlamp-admin
1919
labels:
20-
helm.sh/chart: headlamp-0.25.0
20+
helm.sh/chart: headlamp-0.28.0
2121
app.kubernetes.io/name: headlamp
2222
app.kubernetes.io/instance: headlamp
23-
app.kubernetes.io/version: "0.25.1"
23+
app.kubernetes.io/version: "0.28.0"
2424
app.kubernetes.io/managed-by: Helm
2525
roleRef:
2626
apiGroup: rbac.authorization.k8s.io
@@ -37,10 +37,10 @@ kind: Service
3737
metadata:
3838
name: headlamp
3939
labels:
40-
helm.sh/chart: headlamp-0.25.0
40+
helm.sh/chart: headlamp-0.28.0
4141
app.kubernetes.io/name: headlamp
4242
app.kubernetes.io/instance: headlamp
43-
app.kubernetes.io/version: "0.25.1"
43+
app.kubernetes.io/version: "0.28.0"
4444
app.kubernetes.io/managed-by: Helm
4545
spec:
4646
type: ClusterIP
@@ -62,10 +62,10 @@ kind: Deployment
6262
metadata:
6363
name: headlamp
6464
labels:
65-
helm.sh/chart: headlamp-0.25.0
65+
helm.sh/chart: headlamp-0.28.0
6666
app.kubernetes.io/name: headlamp
6767
app.kubernetes.io/instance: headlamp
68-
app.kubernetes.io/version: "0.25.1"
68+
app.kubernetes.io/version: "0.28.0"
6969
app.kubernetes.io/managed-by: Helm
7070
spec:
7171
replicas: 1
@@ -89,7 +89,7 @@ spec:
8989
runAsGroup: 101
9090
runAsNonRoot: true
9191
runAsUser: 100
92-
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
92+
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
9393
imagePullPolicy: IfNotPresent
9494

9595
env:

0 commit comments

Comments
 (0)