From bdf304ff437f28f72691fddffaa25ffd8d3b0e83 Mon Sep 17 00:00:00 2001 From: Stephen Davies Date: Thu, 18 Jul 2024 16:12:27 +1000 Subject: [PATCH] Flatten terria helm chart --- .prettierignore | 2 +- deploy/helm/terria/Chart.yaml | 6 ------ deploy/helm/terria/charts/terriamap/Chart.yaml | 4 ---- deploy/helm/terria/values.yaml | 9 --------- deploy/helm/{terria => terriamap}/.helmignore | 1 + deploy/helm/terriamap/Chart.yaml | 6 ++++++ deploy/helm/{terria => terriamap}/requirements.yaml | 0 .../{terria => terriamap}/templates/_helpers.tpl | 0 .../terriamap/templates/configmap-client.yaml | 0 .../terriamap/templates/configmap-server.yaml | 0 .../charts => }/terriamap/templates/deployment.yaml | 2 +- .../charts => }/terriamap/templates/service.yaml | 0 .../helm/{terria/charts => }/terriamap/values.yaml | 12 ++++++++++-- 13 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 deploy/helm/terria/Chart.yaml delete mode 100644 deploy/helm/terria/charts/terriamap/Chart.yaml delete mode 100644 deploy/helm/terria/values.yaml rename deploy/helm/{terria => terriamap}/.helmignore (96%) create mode 100644 deploy/helm/terriamap/Chart.yaml rename deploy/helm/{terria => terriamap}/requirements.yaml (100%) rename deploy/helm/{terria => terriamap}/templates/_helpers.tpl (100%) rename deploy/helm/{terria/charts => }/terriamap/templates/configmap-client.yaml (100%) rename deploy/helm/{terria/charts => }/terriamap/templates/configmap-server.yaml (100%) rename deploy/helm/{terria/charts => }/terriamap/templates/deployment.yaml (96%) rename deploy/helm/{terria/charts => }/terriamap/templates/service.yaml (100%) rename deploy/helm/{terria/charts => }/terriamap/values.yaml (90%) diff --git a/.prettierignore b/.prettierignore index 825a640036..4ca578014e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -43,4 +43,4 @@ wwwroot/*.html ckanext-cesiumpreview -deploy/helm/terria/charts/terriamap/templates/ \ No newline at end of file +deploy/helm/terriamap/templates/ diff --git a/deploy/helm/terria/Chart.yaml b/deploy/helm/terria/Chart.yaml deleted file mode 100644 index 7a97f32415..0000000000 --- a/deploy/helm/terria/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -description: "An open source geospatial data explorer" -name: "terria" -version: "0.1.0" -home: "https://github.com/TerriaJS/terriamap" -sources: ["https://github.com/TerriaJS/terriamap"] diff --git a/deploy/helm/terria/charts/terriamap/Chart.yaml b/deploy/helm/terria/charts/terriamap/Chart.yaml deleted file mode 100644 index 96fec5f15b..0000000000 --- a/deploy/helm/terria/charts/terriamap/Chart.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -description: A Helm chart for Kubernetes -name: terriamap -version: 0.1.0 diff --git a/deploy/helm/terria/values.yaml b/deploy/helm/terria/values.yaml deleted file mode 100644 index 9f1b1ecf3d..0000000000 --- a/deploy/helm/terria/values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -global: - rollingUpdate: - maxUnavailable: 0 - exposeNodePorts: false - image: - repository: "ghcr.io/terriajs" - pullPolicy: Always -tags: - all: diff --git a/deploy/helm/terria/.helmignore b/deploy/helm/terriamap/.helmignore similarity index 96% rename from deploy/helm/terria/.helmignore rename to deploy/helm/terriamap/.helmignore index f0c1319444..22a0f43ad9 100644 --- a/deploy/helm/terria/.helmignore +++ b/deploy/helm/terriamap/.helmignore @@ -1,6 +1,7 @@ # Patterns to ignore when building packages. # This supports shell glob matching, relative path matching, and # negation (prefixed with !). Only one pattern per line. +.helmignore .DS_Store # Common VCS dirs .git/ diff --git a/deploy/helm/terriamap/Chart.yaml b/deploy/helm/terriamap/Chart.yaml new file mode 100644 index 0000000000..894f4a5be0 --- /dev/null +++ b/deploy/helm/terriamap/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: terriamap +version: 0.1.2 +home: https://github.com/TerriaJS/terriamap +sources: ["https://github.com/TerriaJS/terriamap"] diff --git a/deploy/helm/terria/requirements.yaml b/deploy/helm/terriamap/requirements.yaml similarity index 100% rename from deploy/helm/terria/requirements.yaml rename to deploy/helm/terriamap/requirements.yaml diff --git a/deploy/helm/terria/templates/_helpers.tpl b/deploy/helm/terriamap/templates/_helpers.tpl similarity index 100% rename from deploy/helm/terria/templates/_helpers.tpl rename to deploy/helm/terriamap/templates/_helpers.tpl diff --git a/deploy/helm/terria/charts/terriamap/templates/configmap-client.yaml b/deploy/helm/terriamap/templates/configmap-client.yaml similarity index 100% rename from deploy/helm/terria/charts/terriamap/templates/configmap-client.yaml rename to deploy/helm/terriamap/templates/configmap-client.yaml diff --git a/deploy/helm/terria/charts/terriamap/templates/configmap-server.yaml b/deploy/helm/terriamap/templates/configmap-server.yaml similarity index 100% rename from deploy/helm/terria/charts/terriamap/templates/configmap-server.yaml rename to deploy/helm/terriamap/templates/configmap-server.yaml diff --git a/deploy/helm/terria/charts/terriamap/templates/deployment.yaml b/deploy/helm/terriamap/templates/deployment.yaml similarity index 96% rename from deploy/helm/terria/charts/terriamap/templates/deployment.yaml rename to deploy/helm/terriamap/templates/deployment.yaml index 5d5bcb47d7..55c1cb1285 100644 --- a/deploy/helm/terria/charts/terriamap/templates/deployment.yaml +++ b/deploy/helm/terriamap/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: - name: terriamap-config-server mountPath: /etc/config/server - name: terriamap-config-client - mountPath: /usr/src/app/component/wwwroot/config.json + mountPath: /app/wwwroot/config.json subPath: config.json volumes: - name: terriamap-config-client diff --git a/deploy/helm/terria/charts/terriamap/templates/service.yaml b/deploy/helm/terriamap/templates/service.yaml similarity index 100% rename from deploy/helm/terria/charts/terriamap/templates/service.yaml rename to deploy/helm/terriamap/templates/service.yaml diff --git a/deploy/helm/terria/charts/terriamap/values.yaml b/deploy/helm/terriamap/values.yaml similarity index 90% rename from deploy/helm/terria/charts/terriamap/values.yaml rename to deploy/helm/terriamap/values.yaml index bd3004d273..e8ef61aab5 100644 --- a/deploy/helm/terria/charts/terriamap/values.yaml +++ b/deploy/helm/terriamap/values.yaml @@ -1,12 +1,20 @@ +global: + rollingUpdate: + maxUnavailable: 0 + exposeNodePorts: false + image: + repository: + tags: + pullPolicy: nodePort: image: # By default this pulls ghcr.io/terriajs/terrimap:latest # Set "full" to specify a custom terriamap image to be used # Or you can set "repository" or "tag" if required # full: "ghcr.io/terriajs/terriamap:0.1.1" - # repository: ghcr.io/terriajs + repository: ghcr.io/terriajs # tag: latest - pullPolicy: Always + pullPolicy: IfNotPresent clientConfig: initializationUrls: - helm