From 63a3f03d2c568b1f7dec94ad4b231060eed3bb50 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 16:23:43 -0300 Subject: [PATCH 1/2] Add custom labels support to ingress --- README.md | 3 +++ charts/sorry-cypress/templates/ingress-api.yml | 3 +++ charts/sorry-cypress/templates/ingress-dashboard.yml | 3 +++ charts/sorry-cypress/templates/ingress-director.yml | 3 +++ charts/sorry-cypress/values.yaml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/README.md b/README.md index 080c85b..9e3a47e 100644 --- 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 index ce29592..f6d5403 100644 --- 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 index 8f23522..4a8bed7 100644 --- 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 index 63ab4fe..07c24d9 100644 --- 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 index 6b58ed4..96e4ea7 100644 --- 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" From 250e023c8c8d3a88ea907222ca1aefaa5b4e48d5 Mon Sep 17 00:00:00 2001 From: Fernando Maia Date: Tue, 12 Jan 2021 16:25:29 -0300 Subject: [PATCH 2/2] Bump chart version to 0.1.10 --- charts/sorry-cypress/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml index ecd7bde..9be443e 100644 --- a/charts/sorry-cypress/Chart.yaml +++ b/charts/sorry-cypress/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sorry-cypress description: A Helm chart for Sorry Cypress type: application -version: 0.1.9 +version: 0.1.10 appVersion: 0.6.1 home: https://sorry-cypress.dev/ sources: