Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

charts: Add support for custom ingress labels #2789

Merged
merged 1 commit into from
Jan 27, 2025
Merged

charts: Add support for custom ingress labels #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/headlamp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ config:
| ingress.enabled | bool | `false` | Enable ingress |
| ingress.className | string | `""` | Ingress class name |
| ingress.annotations | object | `{}` | Ingress annotations (e.g., kubernetes.io/tls-acme: "true") |
| ingress.labels | object | `{}` | Additional labels for the Ingress resource |
| ingress.hosts | list | `[]` | Ingress hosts configuration |
| ingress.tls | list | `[]` | Ingress TLS configuration |

Expand All @@ -182,6 +183,9 @@ ingress:
enabled: true
annotations:
kubernetes.io/tls-acme: "true"
labels:
app.kubernetes.io/part-of: traefik
environment: prod
hosts:
- host: headlamp.example.com
paths:
Expand Down
3 changes: 3 additions & 0 deletions charts/headlamp/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
name: {{ $fullName }}
labels:
{{- include "headlamp.labels" . | nindent 4 }}
{{- with .Values.ingress.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
Expand Down
16 changes: 8 additions & 8 deletions charts/headlamp/tests/expected_templates/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.20.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.23.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/secret.yaml
Expand All @@ -25,10 +25,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.20.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.23.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -45,10 +45,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.20.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.23.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -67,10 +67,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.20.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.23.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand Down
18 changes: 9 additions & 9 deletions charts/headlamp/tests/expected_templates/extra-args.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/secret.yaml
Expand All @@ -25,10 +25,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -45,10 +45,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -70,10 +70,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -97,7 +97,7 @@ spec:
runAsGroup: 101
runAsNonRoot: true
runAsUser: 100
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
imagePullPolicy: IfNotPresent

env:
Expand Down
18 changes: 9 additions & 9 deletions charts/headlamp/tests/expected_templates/extra-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/secret.yaml
Expand Down Expand Up @@ -42,10 +42,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -62,10 +62,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -87,10 +87,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -114,7 +114,7 @@ spec:
runAsGroup: 101
runAsNonRoot: true
runAsUser: 100
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
imagePullPolicy: IfNotPresent

env:
Expand Down
18 changes: 9 additions & 9 deletions charts/headlamp/tests/expected_templates/oidc-create-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/secret.yaml
Expand All @@ -29,10 +29,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -49,10 +49,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -74,10 +74,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -101,7 +101,7 @@ spec:
runAsGroup: 101
runAsNonRoot: true
runAsUser: 100
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
imagePullPolicy: IfNotPresent

env:
Expand Down
18 changes: 9 additions & 9 deletions charts/headlamp/tests/expected_templates/oidc-directly-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/secret.yaml
Expand All @@ -25,10 +25,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -45,10 +45,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -70,10 +70,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -97,7 +97,7 @@ spec:
runAsGroup: 101
runAsNonRoot: true
runAsUser: 100
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
imagePullPolicy: IfNotPresent

env:
Expand Down
18 changes: 9 additions & 9 deletions charts/headlamp/tests/expected_templates/oidc-directly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
---
# Source: headlamp/templates/clusterrolebinding.yaml
Expand All @@ -17,10 +17,10 @@ kind: ClusterRoleBinding
metadata:
name: headlamp-admin
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -37,10 +37,10 @@ kind: Service
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -62,10 +62,10 @@ kind: Deployment
metadata:
name: headlamp
labels:
helm.sh/chart: headlamp-0.25.0
helm.sh/chart: headlamp-0.28.0
app.kubernetes.io/name: headlamp
app.kubernetes.io/instance: headlamp
app.kubernetes.io/version: "0.25.1"
app.kubernetes.io/version: "0.28.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -89,7 +89,7 @@ spec:
runAsGroup: 101
runAsNonRoot: true
runAsUser: 100
image: "ghcr.io/headlamp-k8s/headlamp:v0.25.1"
image: "ghcr.io/headlamp-k8s/headlamp:v0.28.0"
imagePullPolicy: IfNotPresent

env:
Expand Down
Loading
Loading