Merge pull request #284 from johankok/add-additional-labels-to-ingress

Added additionalLabels option for ingress in helm chart
stefanprodan · Sep 22, 2023 · 12ceae4 · 12ceae4
2 parents 4892983 + 12c0789
commit 12ceae4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/charts/podinfo/README.md b/charts/podinfo/README.md
@@ -51,7 +51,7 @@ The command removes all the Kubernetes components associated with the chart and
 The following tables lists the configurable parameters of the podinfo chart and their default values.
 
 | Parameter                         | Default                | Description                                                                                                            |
-|-----------------------------------|------------------------|------------------------------------------------------------------------------------------------------------------------|
+| --------------------------------- | ---------------------- | ---------------------------------------------------------------------------------------------------------------------- |
 | `replicaCount`                    | `1`                    | Desired number of pods                                                                                                 |
 | `logLevel`                        | `info`                 | Log level: `debug`, `info`, `warn`, `error`                                                                            |
 | `backend`                         | `None`                 | Echo backend URL                                                                                                       |
@@ -94,6 +94,7 @@ The following tables lists the configurable parameters of the podinfo chart and
 | `serviceMonitor.additionalLabels` | `{}`                   | Add additional labels to the service monitor                                                                           |
 | `ingress.enabled`                 | `false`                | Enables Ingress                                                                                                        |
 | `ingress.className `              | `""`                   | Use ingressClassName                                                                                                   |
+| `ingress.additionalLabels`        | `{}`                   | Add additional labels to the ingress                                                                                   |
 | `ingress.annotations`             | `{}`                   | Ingress annotations                                                                                                    |
 | `ingress.hosts`                   | `[]`                   | Ingress accepted hosts                                                                                                 |
 | `ingress.tls`                     | `[]`                   | Ingress TLS configuration                                                                                              |
@@ -127,4 +128,3 @@ $ helm install my-release podinfo/podinfo -f values.yaml
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
-
diff --git a/charts/podinfo/templates/ingress.yaml b/charts/podinfo/templates/ingress.yaml
@@ -7,6 +7,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "podinfo.labels" . | nindent 4 }}
+    {{- with .Values.ingress.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/podinfo/values-prod.yaml b/charts/podinfo/values-prod.yaml
@@ -100,6 +100,7 @@ securityContext: {}
 ingress:
   enabled: false
   className: ""
+  additionalLabels: {}
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml
@@ -104,6 +104,7 @@ securityContext: {}
 ingress:
   enabled: false
   className: ""
+  additionalLabels: {}
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"