From 79d67ef13480d55ed281a211b8ebe6c9f622be0a Mon Sep 17 00:00:00 2001 From: Jussi Liukkonen Date: Thu, 26 Oct 2023 18:23:12 +0300 Subject: [PATCH 1/3] Add extra options & missing config option --- charts/geoweb-frontend/Chart.yaml | 4 ++-- charts/geoweb-frontend/README.md | 5 ++++- charts/geoweb-frontend/templates/geoweb-configmap.yaml | 3 +++ charts/geoweb-frontend/templates/geoweb-deployment.yaml | 2 +- charts/geoweb-frontend/values.yaml | 7 ++++++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/charts/geoweb-frontend/Chart.yaml b/charts/geoweb-frontend/Chart.yaml index 5841345..3c936a6 100644 --- a/charts/geoweb-frontend/Chart.yaml +++ b/charts/geoweb-frontend/Chart.yaml @@ -15,13 +15,13 @@ type: application # 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: 3.0.5 +version: 3.0.6 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v8.2.0" +appVersion: "v8.3.1" maintainers: - name: Jusaa diff --git a/charts/geoweb-frontend/README.md b/charts/geoweb-frontend/README.md index d149c65..f8502a2 100644 --- a/charts/geoweb-frontend/README.md +++ b/charts/geoweb-frontend/README.md @@ -103,7 +103,7 @@ The following table lists the configurable parameters of the GeoWeb frontend cha | Parameter | Description | Default | | - | - | - | -| `versions.frontend` | Possibility to override application version | `v8.2.0` | +| `versions.frontend` | Possibility to override application version | `v8.3.1` | | `frontend.name` | Name of frontend | `geoweb` | | `frontend.registry` | Registry to fetch image | `registry.gitlab.com/opengeoweb/opengeoweb` | | `frontend.commitHash` | Adds commitHash annotation to the deployment | | @@ -132,6 +132,7 @@ The following table lists the configurable parameters of the GeoWeb frontend cha | `frontend.env.GW_CAP_BASE_URL` | Url which the application uses to connect to CAP backend | | | `frontend.env.GW_DRAWINGS_BASE_URL` | Url which the application uses to connect to Drawings backend | | | `frontend.env.GW_TAF_BASE_URL` | Url which the application uses to connect to TAF backend | | +| `frontend.env.GW_SW_BASE_URL` | Url which the application uses to connect to Space Weather backend | | | `frontend.env.GW_APP_URL` | Url which the application can be accessed | | | `frontend.env.GW_DEFAULT_THEME` | Default theme: lightMode or darkMode | | | `frontend.env.GW_FEATURE_APP_TITLE` | Application title | | @@ -149,6 +150,7 @@ The following table lists the configurable parameters of the GeoWeb frontend cha | `frontend.env.GW_FEATURE_MENU_INFO` | Enable Info menu option | `true` | | `frontend.env.GW_FEATURE_MENU_VERSION` | Enable Version menu option | `false` | | `frontend.env.GW_FEATURE_MENU_FE_VERSION` | Enable FE Version menu option | `true` | +| `frontend.env.GW_FEATURE_MENU_USER_DOCUMENTATION_URL` | Link to user documentation | | | `frontend.env.GW_SIGMET_BASE_URL` | Url which the application uses to connect to SIGMET backend | | | `frontend.env.GW_AIRMET_BASE_URL` | Url which the application uses to connect to AIRMET backend | | | `frontend.env.GW_FEATURE_MODULE_SIGMET_CONFIGURATION` | Configuration used by SIGMET module | | @@ -158,6 +160,7 @@ The following table lists the configurable parameters of the GeoWeb frontend cha | `frontend.volumeAccessMode` | Permissions of the application for the custom configurations PersistentVolume used | `ReadOnlyMany` | | `frontend.volumeSize` | Size of the custom configurations PersistentVolume | `100Mi` | | `frontend.customConfigurationFolderPath` | Path to the folder which contains custom configurations | | +| `frontend.customConfigurationMountPath` | Folder used to mount custom configurations | `/usr/share/nginx/html/assets/custom` | | `frontend.s3bucketName` | Name of the S3 bucket where custom configurations are stored | | | `frontend.awsAccessKeyId` | AWS_ACCESS_KEY_ID for authenticating to S3 | | | `frontend.awsAccessKeySecret` | AWS_SECRET_ACCESS_KEY for authenticating to S3 | | diff --git a/charts/geoweb-frontend/templates/geoweb-configmap.yaml b/charts/geoweb-frontend/templates/geoweb-configmap.yaml index deb58c7..a3f695f 100644 --- a/charts/geoweb-frontend/templates/geoweb-configmap.yaml +++ b/charts/geoweb-frontend/templates/geoweb-configmap.yaml @@ -52,6 +52,9 @@ data: {{- if .Values.frontend.env.GW_TAF_BASE_URL }} GW_TAF_BASE_URL: {{ .Values.frontend.env.GW_TAF_BASE_URL | quote }} {{- end }} +{{- if .Values.frontend.env.GW_SW_BASE_URL }} + GW_SW_BASE_URL: {{ .Values.frontend.env.GW_SW_BASE_URL | quote }} +{{- end }} {{- if .Values.frontend.env.GW_FEATURE_MENU_FEEDBACK }} GW_FEATURE_MENU_FEEDBACK: {{ .Values.frontend.env.GW_FEATURE_MENU_FEEDBACK | quote }} {{- end }} diff --git a/charts/geoweb-frontend/templates/geoweb-deployment.yaml b/charts/geoweb-frontend/templates/geoweb-deployment.yaml index d67508f..05954e8 100644 --- a/charts/geoweb-frontend/templates/geoweb-deployment.yaml +++ b/charts/geoweb-frontend/templates/geoweb-deployment.yaml @@ -73,7 +73,7 @@ spec: readOnly: true {{- end }} {{- if and .Values.frontend.useCustomConfigurationFiles }} - - mountPath: "/usr/share/nginx/html/assets/custom" + - mountPath: {{ .Values.frontend.customConfigurationMountPath }} name: {{ .Values.frontend.name }}-volume {{- end }} volumes: diff --git a/charts/geoweb-frontend/values.yaml b/charts/geoweb-frontend/values.yaml index ecf928d..2f4c007 100644 --- a/charts/geoweb-frontend/values.yaml +++ b/charts/geoweb-frontend/values.yaml @@ -1,5 +1,5 @@ versions: - frontend: "v8.2.0" + frontend: "v8.3.1" frontend: name: geoweb @@ -45,6 +45,11 @@ frontend: GW_FEATURE_MENU_INFO: true GW_FEATURE_MENU_VERSION: false GW_FEATURE_MENU_FE_VERSION: true + useCustomConfigurationFiles: false + customConfigurationLocation: local + customConfigurationMountPath: /usr/share/nginx/html/assets/custom + volumeAccessMode: ReadOnlyMany + volumeSize: 100Mi ingress: name: nginx-ingress-controller From 17ece09573dace937654608905e5ae1a3e5c6d82 Mon Sep 17 00:00:00 2001 From: Jussi Liukkonen Date: Thu, 26 Oct 2023 19:06:41 +0300 Subject: [PATCH 2/3] Don't include subdirectories in custom configurations --- charts/geoweb-frontend/templates/geoweb-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/geoweb-frontend/templates/geoweb-deployment.yaml b/charts/geoweb-frontend/templates/geoweb-deployment.yaml index 05954e8..51c3100 100644 --- a/charts/geoweb-frontend/templates/geoweb-deployment.yaml +++ b/charts/geoweb-frontend/templates/geoweb-deployment.yaml @@ -33,7 +33,7 @@ spec: export AWS_ACCESS_KEY_ID={{ .Values.frontend.awsAccessKeyId }}; export AWS_SECRET_ACCESS_KEY={{ .Values.frontend.awsAccessKeySecret }}; AWS_DEFAULT_REGION={{ .Values.frontend.awsDefaultRegion }}; - aws s3 cp --recursive s3://{{ .Values.frontend.s3bucketName }}{{ .Values.frontend.customConfigurationFolderPath }} /frontend; + aws s3 cp --recursive --exclude "*/*" s3://{{ .Values.frontend.s3bucketName }}{{ .Values.frontend.customConfigurationFolderPath }} /frontend; volumeMounts: - mountPath: "/frontend/" name: {{ .Values.frontend.name }}-volume From e2b19156c126b551fdd6e654bbb13f022d5cbe3b Mon Sep 17 00:00:00 2001 From: Jussi Liukkonen Date: Fri, 27 Oct 2023 14:53:43 +0300 Subject: [PATCH 3/3] Clarify README --- charts/geoweb-frontend/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/geoweb-frontend/README.md b/charts/geoweb-frontend/README.md index f8502a2..86100dc 100644 --- a/charts/geoweb-frontend/README.md +++ b/charts/geoweb-frontend/README.md @@ -7,7 +7,7 @@ helm repo update # Create requried dependencies -Create values.yaml file for required variables: +Create your own values file for required variables: * Minimal setup ```yaml @@ -77,7 +77,7 @@ frontend: Execute the following for testing the chart: ```bash -helm install geoweb-frontend fmi/geoweb-frontend --dry-run --debug -n geoweb --values=./values.yaml +helm install geoweb-frontend fmi/geoweb-frontend --dry-run --debug -n geoweb --values=./.yaml ``` # Installing the Chart @@ -85,7 +85,7 @@ helm install geoweb-frontend fmi/geoweb-frontend --dry-run --debug -n geoweb --v Execute the following for installing the chart: ```bash -helm install geoweb-frontend fmi/geoweb-frontend -n geoweb --values=./values.yaml +helm install geoweb-frontend fmi/geoweb-frontend -n geoweb --values=./.yaml ``` # Deleting the Chart @@ -99,7 +99,7 @@ kubectl delete namespace geoweb ``` # Chart Configuration -The following table lists the configurable parameters of the GeoWeb frontend chart and their default values. +The following table lists the configurable parameters of the GeoWeb frontend chart and their default values specified in file values.yaml. | Parameter | Description | Default | | - | - | - |