Merge pull request #17 from magda-io/use-magda-common

Use magda common
magda-io · Oct 11, 2021 · bb47898 · bb47898
2 parents 97b80fa + 81803e6
commit bb47898
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,6 +18,9 @@ jobs:
           node-version: 10
       - run: yarn install
       - run: yarn build
+
+      - name: helm-build-dependencies
+        run: yarn update-all-charts
 
       - run: yarn helm-lint
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,9 @@ jobs:
           node-version: 10
       - run: yarn install
       - run: yarn build
-
+
+      - name: helm-build-dependencies
+        run: yarn update-all-charts
 
       - name: helm-check
         run: yarn helm-lint

diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@ wwwroot/privateconfig.json
 deploy/packages/
 deploy/work/
 packages/
+
+deploy/**/charts
diff --git a/.helmdocsignore b/.helmdocsignore
@@ -1 +1,2 @@
 deploy/helm/terria
+deploy/helm/magda-preview-map/charts
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,10 @@
 
 > The repo was part of [magda main repo](https://github.com/magda-io/magda). For history before v0.0.58, please check [CHANGES.md of main repo](https://github.com/magda-io/magda/blob/master/CHANGES.md).
 
+## 1.1.0
+- Related to https://github.com/magda-io/magda/issues/3229, Use magda-common for docker image related logic
+- Fixed: Should not set `replicas` when `autoscaler` is enabled
+
 ## 1.0.1
 - improve ci scripts & setup helm-docs
 - #12 make preview map support format string: "ESRI MapServer" & "ESRI FeatureServer"

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # magda-preview-map
 
-![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square)
+![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square)
 
 A Helm chart for Magda Preview Map module - forked from Terria Map Repo
 
@@ -16,6 +16,10 @@ See the [TerriaJS README](https://github.com/TerriaJS/TerriaJS) or [TerriaMap Re
 
 Kubernetes: `>= 1.14.0-0`
 
+| Repository | Name | Version |
+|------------|------|---------|
+| https://charts.magda.io | magda-common | 1.0.0-alpha.4 |
+
 ## Values
 
 | Key | Type | Default | Description |

diff --git a/deploy/helm/magda-preview-map/Chart.lock b/deploy/helm/magda-preview-map/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: magda-common
+  repository: https://charts.magda.io
+  version: 1.0.0-alpha.4
+digest: sha256:a5dcf2df16ca5a3972f92d91434c2e78be0ce411994d2a3cb89c674a711ddc24
+generated: "2021-10-11T19:45:18.475213+11:00"
diff --git a/deploy/helm/magda-preview-map/Chart.yaml b/deploy/helm/magda-preview-map/Chart.yaml
@@ -1,7 +1,11 @@
 apiVersion: v2
 description: A Helm chart for Magda Preview Map module - forked from Terria Map Repo
 name: magda-preview-map
-version: 1.0.1
+version: 1.1.0
 kubeVersion: ">= 1.14.0-0"
 home: "https://github.com/magda-io/magda-preview-map"
 sources: [ "https://github.com/magda-io/magda-preview-map" ]
+dependencies:
+  - name: magda-common
+    version: "1.0.0-alpha.4"
+    repository: "https://charts.magda.io"
diff --git a/deploy/helm/magda-preview-map/templates/deployment.yaml b/deploy/helm/magda-preview-map/templates/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: preview-map
 spec:
-  {{- if .Values.autoscaler.enabled }}
+  {{- if empty .Values.autoscaler.enabled }}
   replicas: {{ .Values.replicas | default 1 }}
   {{- end }}
   strategy:
@@ -19,11 +19,7 @@ spec:
       labels:
         service: preview-map
     spec:
-{{- $imagePullSecret := (ne (.Values.image.imagePullSecret | typeOf) "<nil>") | ternary .Values.image.imagePullSecret ( (ne (.Values.global.image.imagePullSecret | typeOf) "<nil>") | ternary .Values.global.image.imagePullSecret .Values.defaultImage.imagePullSecret ) -}}
-      {{- if ne ($imagePullSecret | toString) "false" }}
-      imagePullSecrets:
-        - name: {{ $imagePullSecret }}
-      {{- end }}
+      {{- include "magda.imagePullSecrets" . | indent 6 }}
       containers:
       - name: preview-map
         resources:
@@ -40,8 +36,8 @@ spec:
         env:
         - name: NODE_ENV
           value: production
-        image: "{{ .Values.image.repository | default .Values.global.image.repository | default .Values.defaultImage.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Values.global.image.tag | default .Chart.Version }}"
-        imagePullPolicy: {{ .Values.image.pullPolicy | default .Values.global.image.pullPolicy }}
+        image: {{ include "magda.image" . | quote }}
+        imagePullPolicy: {{ include "magda.imagePullPolicy" . | quote }}
         command: 
           - "node"
           - "node_modules/terriajs-server/lib/app.js"

diff --git a/deploy/helm/magda-preview-map/values.yaml b/deploy/helm/magda-preview-map/values.yaml
@@ -4,7 +4,6 @@ global:
 
 # image setting loadding order: (from higher priority to lower priority)
 # - Values.image.x
-# - Values.global.image.x
 # - Values.defaultImage.x
 # You can set `imagePullSecret` value to `false` (bool) to reset the value (see example below)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@magda/preview-map",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Geospatial preview based on TerriaJS.",
   "license": "Apache-2.0",
   "engines": {