diff --git a/charts/headlamp/README.md b/charts/headlamp/README.md index 9989e2358a8..27d8a690988 100644 --- a/charts/headlamp/README.md +++ b/charts/headlamp/README.md @@ -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 | @@ -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: diff --git a/charts/headlamp/templates/ingress.yaml b/charts/headlamp/templates/ingress.yaml index 92c0635b9f7..b8dc73dd375 100644 --- a/charts/headlamp/templates/ingress.yaml +++ b/charts/headlamp/templates/ingress.yaml @@ -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 }} diff --git a/charts/headlamp/tests/expected_templates/default.yaml b/charts/headlamp/tests/expected_templates/default.yaml index b39fee52347..f7776cd0acf 100644 --- a/charts/headlamp/tests/expected_templates/default.yaml +++ b/charts/headlamp/tests/expected_templates/default.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/charts/headlamp/tests/expected_templates/extra-args.yaml b/charts/headlamp/tests/expected_templates/extra-args.yaml index 57af677203e..c26f6f7884d 100644 --- a/charts/headlamp/tests/expected_templates/extra-args.yaml +++ b/charts/headlamp/tests/expected_templates/extra-args.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/tests/expected_templates/extra-manifests.yaml b/charts/headlamp/tests/expected_templates/extra-manifests.yaml index 3c84f004eea..6eebf21edb1 100644 --- a/charts/headlamp/tests/expected_templates/extra-manifests.yaml +++ b/charts/headlamp/tests/expected_templates/extra-manifests.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/tests/expected_templates/oidc-create-secret.yaml b/charts/headlamp/tests/expected_templates/oidc-create-secret.yaml index e29eaa360bb..4d0e74a1eaa 100644 --- a/charts/headlamp/tests/expected_templates/oidc-create-secret.yaml +++ b/charts/headlamp/tests/expected_templates/oidc-create-secret.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/tests/expected_templates/oidc-directly-env.yaml b/charts/headlamp/tests/expected_templates/oidc-directly-env.yaml index e00bec21bd8..4f31ed6bc32 100644 --- a/charts/headlamp/tests/expected_templates/oidc-directly-env.yaml +++ b/charts/headlamp/tests/expected_templates/oidc-directly-env.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/tests/expected_templates/oidc-directly.yaml b/charts/headlamp/tests/expected_templates/oidc-directly.yaml index 60381b08789..081deef6698 100644 --- a/charts/headlamp/tests/expected_templates/oidc-directly.yaml +++ b/charts/headlamp/tests/expected_templates/oidc-directly.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/tests/expected_templates/oidc-external-secret.yaml b/charts/headlamp/tests/expected_templates/oidc-external-secret.yaml index e73e9a9c6d2..d1f68a42757 100644 --- a/charts/headlamp/tests/expected_templates/oidc-external-secret.yaml +++ b/charts/headlamp/tests/expected_templates/oidc-external-secret.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 # Check if externalSecret is enabled diff --git a/charts/headlamp/tests/expected_templates/volumes-added.yaml b/charts/headlamp/tests/expected_templates/volumes-added.yaml index 633cdea6459..486c005e78f 100644 --- a/charts/headlamp/tests/expected_templates/volumes-added.yaml +++ b/charts/headlamp/tests/expected_templates/volumes-added.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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: diff --git a/charts/headlamp/values.yaml b/charts/headlamp/values.yaml index 80be89cb04b..d4281901762 100644 --- a/charts/headlamp/values.yaml +++ b/charts/headlamp/values.yaml @@ -166,6 +166,11 @@ ingress: {} # kubernetes.io/tls-acme: "true" + # -- Additional labels to add to the Ingress resource + labels: {} + # app.kubernetes.io/part-of: traefik + # environment: prod + # -- Ingress class name. replacement for the deprecated "kubernetes.io/ingress.class" annotation ingressClassName: ""