From 073e084d76fa87b5f0ea24c619d61c8dd62ce048 Mon Sep 17 00:00:00 2001 From: Luis Carlos Date: Mon, 25 Sep 2023 09:08:00 +0200 Subject: [PATCH 1/4] Doc server enable flag --- .../eoapi/templates/services/ingress-nginx.yaml | 2 +- .../eoapi/templates/services/nginx-doc-server.yaml | 2 +- helm-chart/eoapi/values.yaml | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/helm-chart/eoapi/templates/services/ingress-nginx.yaml b/helm-chart/eoapi/templates/services/ingress-nginx.yaml index 3debccc7..def0fbee 100644 --- a/helm-chart/eoapi/templates/services/ingress-nginx.yaml +++ b/helm-chart/eoapi/templates/services/ingress-nginx.yaml @@ -41,7 +41,7 @@ spec: {{- end }}{{/* END: if index $v "enabled" */}} {{- end }}{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}} {{- end }}{{/* END: range $serviceName, $v := .Values*/}} - {{- if not $.Values.testing }} + {{- if (and (not $.Values.testing) (.Values.docServer.enabled)) }} - pathType: Prefix path: /(/|$) backend: diff --git a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml index 706fd96a..30723e66 100644 --- a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml +++ b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml @@ -1,4 +1,4 @@ -{{- if (and (.Values.ingress.className) (eq .Values.ingress.className "nginx") (not .Values.testing)) }} +{{- if (and (.Values.ingress.className) (eq .Values.ingress.className "nginx") (not .Values.testing) (.Values.docServer.enabled))}} apiVersion: v1 kind: ConfigMap metadata: diff --git a/helm-chart/eoapi/values.yaml b/helm-chart/eoapi/values.yaml index 8f0484f2..b25f9134 100644 --- a/helm-chart/eoapi/values.yaml +++ b/helm-chart/eoapi/values.yaml @@ -54,8 +54,8 @@ db: memory: "1024Mi" secrets: POSTGRES_DB: "postgis" - POSTGRES_USER: "" - POSTGRES_PASSWORD: "" + POSTGRES_USER: "postgis" + POSTGRES_PASSWORD: "postgis" POSTGRES_PORT: "5432" POSTGRES_HOST: "pgstac" POSTGRES_HOST_READER: "pgstac" @@ -64,8 +64,8 @@ db: DB_MAX_CONN_SIZE: "15" # default connect: https://www.postgresql.org/docs/current/libpq-envars.html PGDATA: "/var/lib/postgresql/data/pgdata" - PGUSER: "" - PGPASSWORD: "" + PGUSER: "postgis" + PGPASSWORD: "postgis" PGDATABASE: "postgis" # only used in CI for running parallel helm installs @@ -190,7 +190,8 @@ vector: PORT: "8080" # https://www.uvicorn.org/settings/#production WEB_CONCURRENCY: "10" - +docServer: + enabled: true From 195d78b2256f0b0e5dbadd2277960582ae5482bd Mon Sep 17 00:00:00 2001 From: Luis Carlos Date: Mon, 25 Sep 2023 09:09:26 +0200 Subject: [PATCH 2/4] Clean values --- helm-chart/eoapi/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-chart/eoapi/values.yaml b/helm-chart/eoapi/values.yaml index b25f9134..78cabdb5 100644 --- a/helm-chart/eoapi/values.yaml +++ b/helm-chart/eoapi/values.yaml @@ -54,8 +54,8 @@ db: memory: "1024Mi" secrets: POSTGRES_DB: "postgis" - POSTGRES_USER: "postgis" - POSTGRES_PASSWORD: "postgis" + POSTGRES_USER: "" + POSTGRES_PASSWORD: "" POSTGRES_PORT: "5432" POSTGRES_HOST: "pgstac" POSTGRES_HOST_READER: "pgstac" @@ -65,8 +65,8 @@ db: # default connect: https://www.postgresql.org/docs/current/libpq-envars.html PGDATA: "/var/lib/postgresql/data/pgdata" PGUSER: "postgis" - PGPASSWORD: "postgis" - PGDATABASE: "postgis" + PGPASSWORD: "" + PGDATABASE: "" # only used in CI for running parallel helm installs testing: false From a8040bc56cefd5c7b8d621278f35e30f6ca25d78 Mon Sep 17 00:00:00 2001 From: Luis Carlos Date: Mon, 25 Sep 2023 09:10:06 +0200 Subject: [PATCH 3/4] Fix values --- helm-chart/eoapi/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-chart/eoapi/values.yaml b/helm-chart/eoapi/values.yaml index 78cabdb5..2aa23f59 100644 --- a/helm-chart/eoapi/values.yaml +++ b/helm-chart/eoapi/values.yaml @@ -64,9 +64,9 @@ db: DB_MAX_CONN_SIZE: "15" # default connect: https://www.postgresql.org/docs/current/libpq-envars.html PGDATA: "/var/lib/postgresql/data/pgdata" - PGUSER: "postgis" + PGUSER: "" PGPASSWORD: "" - PGDATABASE: "" + PGDATABASE: "postgis" # only used in CI for running parallel helm installs testing: false From ff6120278c53259854c01f2584762c240fb8a3f7 Mon Sep 17 00:00:00 2001 From: Luis Carlos Date: Mon, 25 Sep 2023 09:12:45 +0200 Subject: [PATCH 4/4] Upgrade chart version --- helm-chart/eoapi/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml index f7b48ff6..6d1872f1 100644 --- a/helm-chart/eoapi/Chart.yaml +++ b/helm-chart/eoapi/Chart.yaml @@ -17,7 +17,7 @@ kubeVersion: ">=1.23.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: "0.1.7" +version: "0.1.8" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to