Add custom labels support to ingress

sorry-cypress · Jan 12, 2021 · 63a3f03 · 63a3f03
1 parent daa0dec
commit 63a3f03
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ https://sorry-cypress.dev/api#configuration
 | `api.image.pullPolicy`      | Image pull policy                     | `Always`                    |
 | `api.resources`             | Resources to initialize the container | `{}`                        |
 | `api.service.port`          | Kubernetes service port               | `4000`                      |
+| `api.ingress.labels`        | Ingress labels                        | `{}`                        |
 | `api.ingress.annotations`   | Ingress annotations                   | `{}`                        |
 | `api.ingress.hosts[0].host` | Hostname to the service installation  | `api.chart-example.local`   |
 | `api.ingress.tls`           | Ingress secrets for TLS certificates  | `[]`                        |
@@ -82,6 +83,7 @@ https://sorry-cypress.dev/dashboard#configuration
 | `dashboard.environmentVariables.graphQlSchemaUrl` | Set the environment variable `GRAPHQL_SCHEMA_URL` with the URL of API service. | `""`                              |
 | `dashboard.service.port`                          | Kubernetes service port                                                        | `4000`                            |
 | `dashboard.ingress.enabled`                       | Flag to define if the dashboard service ingress is enabled                     | `true`                            |
+| `dashboard.ingress.labels`                        | Ingress labels                                                                 | `{}`                              |
 | `dashboard.ingress.annotations`                   | Ingress annotations                                                            | `{}`                              |
 | `dashboard.ingress.hosts[0].host`                 | Hostname to the service installation                                           | `dashboard.chart-example.local`   |
 | `dashboard.ingress.tls`                           | Ingress secrets for TLS certificates                                           | `[]`                              |
@@ -107,6 +109,7 @@ https://sorry-cypress.dev/director/configuration
 | `director.s3.secretAccessKey`                     | The `AWS_SECRET_ACCESS_KEY` environment variable to configure AWS credentials, if the screenshots driver is set to `"../screenshots/s3.driver"`                              | `zyx`                            |
 | `director.service.port`                           | Kubernetes service port                                                                                                                                                      | `4000`                           |
 | `director.ingress.enabled`                        | Flag to define if the director service ingress is enabled                                                                                                                    | `true`                           |
+| `director.ingress.labels`                         | Ingress labels                                                                                                                                                               | `{}`                             |
 | `director.ingress.annotations`                    | Ingress annotations                                                                                                                                                          | `{}`                             |
 | `director.ingress.hosts[0].host`                  | Hostname to the service installation                                                                                                                                         | `director.chart-example.local`   |
 | `director.ingress.tls`                            | Ingress secrets for TLS certificates                                                                                                                                         | `[]`                             |

diff --git a/charts/sorry-cypress/templates/ingress-api.yml b/charts/sorry-cypress/templates/ingress-api.yml
@@ -11,6 +11,9 @@ metadata:
   name: {{ $fullName }}-api
   labels:
     {{- include "sorry-cypress-helm.labels" . | nindent 4 }}
+    {{- with .Values.api.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end}}
   {{- with .Values.api.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/sorry-cypress/templates/ingress-dashboard.yml b/charts/sorry-cypress/templates/ingress-dashboard.yml
@@ -11,6 +11,9 @@ metadata:
   name: {{ $fullName }}-dashboard
   labels:
     {{- include "sorry-cypress-helm.labels" . | nindent 4 }}
+    {{- with .Values.dashboard.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end}}
   {{- with .Values.dashboard.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/sorry-cypress/templates/ingress-director.yml b/charts/sorry-cypress/templates/ingress-director.yml
@@ -11,6 +11,9 @@ metadata:
   name: {{ $fullName }}-director
   labels:
     {{- include "sorry-cypress-helm.labels" . | nindent 4 }}
+    {{- with .Values.director.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end}}
   {{- with .Values.director.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
@@ -25,6 +25,7 @@ api:
     port: 4000
 
   ingress:
+    labels: {}
     annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
@@ -64,6 +65,7 @@ dashboard:
 
   ingress:
     enabled: true
+    labels: {}
     annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
@@ -128,6 +130,7 @@ director:
 
   ingress:
     enabled: true
+    labels: {}
     annotations: {}
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"