magda-io · t83714 · Oct 2, 2021 · Sep 30, 2021 · Oct 1, 2021 · Oct 1, 2021
diff --git a/CHANGES.md b/CHANGES.md
@@ -13,6 +13,9 @@
 - #3221 Make correspondence-api turned off by default
 - #3223 "Open in NationalMap" button will send data with the version field
 - #3226 Release `magda-common` library Helm Chart to Share Common Deployment Logic with Plugin Developers
+- remove magda-auth-ckan from default CD deployment
+- Related to #3229, implement docker image related templates
+- Related to #3229, add `magdaModuleType: "core"` to all core chart annotation
 
 ## 0.0.60
 

diff --git a/deploy/helm/internal-charts/admin-api/Chart.yaml b/deploy/helm/internal-charts/admin-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: admin-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/apidocs-server/Chart.yaml b/deploy/helm/internal-charts/apidocs-server/Chart.yaml
@@ -3,3 +3,6 @@ description: A Helm chart for Kubernetes
 name: apidocs-server
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/authorization-api/Chart.yaml b/deploy/helm/internal-charts/authorization-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: authorization-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/authorization-db/Chart.yaml b/deploy/helm/internal-charts/authorization-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: authorization-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml b/deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml
@@ -4,3 +4,5 @@ name: cloud-sql-proxy
 version: 1.0.0-alpha.2
 appVersion: "1.11"
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/combined-db/Chart.yaml b/deploy/helm/internal-charts/combined-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: combined-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/content-api/Chart.yaml b/deploy/helm/internal-charts/content-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: content-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/content-db/Chart.yaml b/deploy/helm/internal-charts/content-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: content-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/correspondence-api/Chart.yaml b/deploy/helm/internal-charts/correspondence-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: correspondence-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/elasticsearch/Chart.yaml b/deploy/helm/internal-charts/elasticsearch/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: elasticsearch
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/gateway/Chart.yaml b/deploy/helm/internal-charts/gateway/Chart.yaml
@@ -4,3 +4,5 @@ description: The Gateway Component of Magda that routes incoming requets to
 name: gateway
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/indexer/Chart.yaml b/deploy/helm/internal-charts/indexer/Chart.yaml
@@ -3,3 +3,6 @@ description: A Helm chart for Kubernetes
 name: indexer
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/ingress/Chart.yaml b/deploy/helm/internal-charts/ingress/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: ingress
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/magda-postgres/Chart.yaml b/deploy/helm/internal-charts/magda-postgres/Chart.yaml
@@ -4,6 +4,8 @@ description: "A helm wrapper chart that provides in-kubernetes postgreSQL for Ma
 type: application
 kubeVersion: ">= 1.14.0-0"
 version: "1.0.0-alpha.2"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: postgresql
     version: "10.9.1"

diff --git a/deploy/helm/internal-charts/magda-postgres/templates/cronjob-backup.yaml b/deploy/helm/internal-charts/magda-postgres/templates/cronjob-backup.yaml
@@ -20,7 +20,7 @@ spec:
           labels:
             cron: "{{ .Values.postgresql.fullnameOverride }}-backup-jobs"
         spec:
-{{- include "magda.pullSecrets" . | indent 10 }}
+{{- include "magda.imagePullSecrets" . | indent 10 }}
           containers:
           - image: "{{ .Values.backupRestore.image.repository }}:{{ .Values.backupRestore.image.tag }}"
             imagePullPolicy: "{{ .Values.backupRestore.image.pullPolicy }}"

diff --git a/deploy/helm/internal-charts/opa/Chart.yaml b/deploy/helm/internal-charts/opa/Chart.yaml
@@ -4,3 +4,6 @@ description: Magda's Access Control Policy Engine ([Open Policy
 name: opa
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/priorities/Chart.yaml b/deploy/helm/internal-charts/priorities/Chart.yaml
@@ -3,3 +3,6 @@ description: A Helm chart for Kubernetes
 name: priorities
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml b/deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml
@@ -3,3 +3,6 @@ name: rds-dev-proxy
 description: A RDS proxy for dev / debugging purpose
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/registry-api/Chart.yaml b/deploy/helm/internal-charts/registry-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: registry-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/registry-db/Chart.yaml b/deploy/helm/internal-charts/registry-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: registry-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/search-api-node/Chart.yaml b/deploy/helm/internal-charts/search-api-node/Chart.yaml
@@ -3,3 +3,6 @@ kubeVersion: ">= 1.14.0-0"
 description: A Helm chart for Kubernetes
 name: search-api-node
 version: 1.0.0-alpha.2
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/search-api/Chart.yaml b/deploy/helm/internal-charts/search-api/Chart.yaml
@@ -3,3 +3,6 @@ description: A Helm chart for Kubernetes
 name: search-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
+
diff --git a/deploy/helm/internal-charts/session-db/Chart.yaml b/deploy/helm/internal-charts/session-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: session-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/storage-api/Chart.yaml b/deploy/helm/internal-charts/storage-api/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: storage-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: minio
     version: 7.1.2

diff --git a/deploy/helm/internal-charts/tenant-api/Chart.yaml b/deploy/helm/internal-charts/tenant-api/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: tenant-api
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/internal-charts/tenant-db/Chart.yaml b/deploy/helm/internal-charts/tenant-db/Chart.yaml
@@ -3,6 +3,8 @@ description: A Helm chart for Kubernetes
 name: tenant-db
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 dependencies:
   - name: magda-postgres
     version: "1.0.0-alpha.2"

diff --git a/deploy/helm/internal-charts/web-server/Chart.yaml b/deploy/helm/internal-charts/web-server/Chart.yaml
@@ -3,3 +3,5 @@ description: A Helm chart for Kubernetes
 name: web-server
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
diff --git a/deploy/helm/local-deployment/Chart.lock b/deploy/helm/local-deployment/Chart.lock
@@ -4,16 +4,13 @@ dependencies:
   version: 1.0.0-alpha.2
 - name: magda-auth-google
   repository: https://charts.magda.io
-  version: 1.2.1
-- name: magda-auth-ckan
-  repository: https://charts.magda.io
-  version: 1.2.1
+  version: 1.2.2
 - name: magda-auth-internal
   repository: https://charts.magda.io
-  version: 1.2.1
+  version: 1.2.2
 - name: magda-auth-arcgis
   repository: https://charts.magda.io
-  version: 1.2.1
+  version: 1.2.2
 - name: magda-ckan-connector
   repository: https://charts.magda.io
   version: 1.0.1
@@ -113,5 +110,5 @@ dependencies:
 - name: magda-project-open-data-connector
   repository: https://charts.magda.io
   version: 0.0.57-0
-digest: sha256:28d100824c56ddddc92e6cfee0681ff6211373b6f08caefab06810d6822be9ec
-generated: "2021-09-23T00:49:03.520771+10:00"
+digest: sha256:3269dd5ea33b1199b21b232749ce3dc58c0ced8e8820e78ec525c22bac97736c
+generated: "2021-10-01T23:32:33.453343+10:00"
diff --git a/deploy/helm/local-deployment/Chart.yaml b/deploy/helm/local-deployment/Chart.yaml
@@ -9,28 +9,21 @@ dependencies:
     repository: "file://../magda"
 
   - name: magda-auth-google
-    version: "1.2.1"
+    version: "1.2.2"
     repository: https://charts.magda.io
     tags:
       - all
       - magda-auth-google
 
-  - name: magda-auth-ckan
-    version: "1.2.1"
-    repository: https://charts.magda.io
-    tags:
-      - all
-      - magda-auth-ckan
-
   - name: magda-auth-internal
-    version: "1.2.1"
+    version: "1.2.2"
     repository: https://charts.magda.io
     tags:
       - all
       - magda-auth-internal
 
   - name: magda-auth-arcgis
-    version: "1.2.1"
+    version: "1.2.2"
     repository: https://charts.magda.io
     tags:
       - all

diff --git a/deploy/helm/local-deployment/values.yaml b/deploy/helm/local-deployment/values.yaml
@@ -52,16 +52,6 @@ magda-auth-google:
     tag: 1.0.1
     repository: docker.io/data61
 
-magda-auth-ckan:
-  ckanUrl: "https://data.gov.au/data"
-  authPluginConfig:
-    name: "Data.gov.au"
-    loginFormExtraInfoHeading: "Register"
-    loginFormExtraInfoContent: "To register a new [data.gov.au](https://data.gov.au/) account, [click here](https://data.gov.au/data/user/register)"
-  image:
-    tag: 1.0.1
-    repository: docker.io/data61
-
 magda-auth-internal:
   authPluginConfig:
     loginFormExtraInfoContent: "Forgot your password? Email [magda-test@googlegroups.com](magda-test@googlegroups.com)"

diff --git a/deploy/helm/magda-common/Chart.yaml b/deploy/helm/magda-common/Chart.yaml
@@ -6,6 +6,8 @@ description: |
 type: library
 version: 1.0.0-alpha.2
 kubeVersion: ">= 1.14.0-0"
+annotations:
+  magdaModuleType: "core"
 keywords:
   - common
   - helper

diff --git a/deploy/helm/magda-common/templates/_helpers.tpl b/deploy/helm/magda-common/templates/_helpers.tpl
@@ -41,4 +41,21 @@
   {{-   $_ := set $data $fullPath $str -}}
   {{- end -}}
 {{- mustToRawJson $data | quote -}} 
+{{- end -}}
+
+{{/*
+  Get Magda Module Type from current chart's Chart.yaml `annotations` field
+  Parameters / input:
+    Must passing the root scope as the template input.
+  Return:
+    Magda Module Type string.
+    If not set in current chart's Chart.yaml, return "".
+  Usage: 
+    {{ include "magda.getMagdaModuleType" . }}
+*/}}
+{{- define "magda.getMagdaModuleType" -}}
+  {{- /* add `| mustToJson | mustFromJson` to convert the type to avoid type error */}}
+  {{- $annotations := .Chart.Annotations | default dict | mustToJson | mustFromJson }}
+  {{- $magdaModuleType := get $annotations "magdaModuleType" | default "" }}
+  {{- print $magdaModuleType }}
 {{- end -}}