From 8ff82a7a6f89dbda82ca33d769d8c0e97e391ddb Mon Sep 17 00:00:00 2001 From: jfv opensource Date: Mon, 18 Dec 2023 15:32:43 +0100 Subject: [PATCH 1/2] Allow to use ingress controller default secret instead of dedicated one(s) --- README.md | 1 + charts/ocsinventory/templates/ingress.yaml | 4 +++- charts/ocsinventory/values.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 26fa25e..4dc07d5 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,7 @@ Key | Description | Default `mariadb.auth.username` | Database user to create | `""` `mariadb.auth.password` | Password for the user | `""` `ingress.enabled` | Enable use of ingress controllers | `true` +`ingress.tls` | Create certificates if not exists | `true` `ingress.hosts` | OCS hosts to create application URLs | `""` `ingress.annotations` | An array of ingress annotations | `{}` `ingress.basicauth.enabled` | Wether to enable basic auth | `"false"` diff --git a/charts/ocsinventory/templates/ingress.yaml b/charts/ocsinventory/templates/ingress.yaml index 884a4ec..04ca4cf 100644 --- a/charts/ocsinventory/templates/ingress.yaml +++ b/charts/ocsinventory/templates/ingress.yaml @@ -14,7 +14,9 @@ spec: - hosts: {{- range .Values.ingress.hosts }} - {{ . }} - secretName: {{ . }}-tls + {{- if $.Values.ingress.tls }} + secretName: {{ . }}-tls + {{- end}} {{- end}} rules: {{- range .Values.ingress.hosts }} diff --git a/charts/ocsinventory/values.yaml b/charts/ocsinventory/values.yaml index 7360b7f..6a229df 100644 --- a/charts/ocsinventory/values.yaml +++ b/charts/ocsinventory/values.yaml @@ -81,6 +81,7 @@ ingress: labels: {} hosts: - "" + tls: true annotations: kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/force-ssl-redirect: "true" From 0aff4c044314357541ccee7b0aec495a2ac1ba87 Mon Sep 17 00:00:00 2001 From: jfv opensource Date: Mon, 18 Dec 2023 15:34:28 +0100 Subject: [PATCH 2/2] Allow to use ingress controller default secret instead of dedicated one(s) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4dc07d5..c05cac3 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ Key | Description | Default `mariadb.auth.username` | Database user to create | `""` `mariadb.auth.password` | Password for the user | `""` `ingress.enabled` | Enable use of ingress controllers | `true` -`ingress.tls` | Create certificates if not exists | `true` +`ingress.tls` | Use dedicated certificates | `true` `ingress.hosts` | OCS hosts to create application URLs | `""` `ingress.annotations` | An array of ingress annotations | `{}` `ingress.basicauth.enabled` | Wether to enable basic auth | `"false"`