StatCan · chian-007 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/stable/ckan/Chart.lock b/stable/ckan/Chart.lock
diff --git a/stable/ckan/Chart.yaml b/stable/ckan/Chart.yaml
@@ -1,37 +1,38 @@
-name: ckan
 apiVersion: v2
-type: application
-version: 0.0.31
-appVersion: 2.9.5
+appVersion: 2.10.3
+dependencies:
+- condition: redis.enabled
+  name: redis
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
+  version: 12.10.1
+- condition: postgresql.enabled
+  name: postgresql
+  repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
+  version: 10.2.0
+- condition: solr.enabled
+  name: solr
+  repository: https://statcan.github.io/charts
+  version: 1.5.8
+- condition: datapusher.enabled
+  name: datapusher
+  repository: https://statcan.github.io/charts
+  version: 1.0.0
 description: CKAN Helm Chart for Kubernetes.
+home: https://ckan.org/
+icon: https://ckan.org/static/img/logo.svg
 keywords:
 - ckan
 - http
 - web
 - application
 - python
-home: https://ckan.org/
-icon: https://ckan.org/static/img/logo.svg
+maintainers:
+- email: [email protected]
+  name: sylus
+- email: [email protected]
+  name: zachomedia
+name: ckan
 sources:
 - https://github.com/drupalwxt/wxt
-maintainers:
-- name: Jianlong
-  email: [email protected]
-engine: gotpl
-dependencies:
-  - name: redis
-    version: 12.10.1
-    repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-    condition: redis.enabled
-  - name: postgresql
-    version: 10.2.0
-    repository: https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
-    condition: postgresql.enabled
-  - name: solr
-    version: 1.5.10
-    repository: https://statcan.github.io/charts
-    condition: solr.enabled
-  - name: datapusher
-    version: 1.0.0
-    repository: https://statcan.github.io/charts
-    condition: datapusher.enabled
+type: application
+version: 0.0.32
diff --git a/stable/ckan/conf/ckan/overlay-production.ini b/stable/ckan/conf/ckan/overlay-production.ini
@@ -18,9 +18,16 @@
 #
 
 [app:main]
-ckan.site_title = CKAN-SCHEMING-FDI
+ckan.locales_offered = en fr
 ckan.site_logo = /base/images/ckan-logo.png
 ckan.site_description =
+ckan.auth.user_create_organizations = False
+ckan.auth.user_create_groups = False
+ckan.auth.user_delete_groups = false
+ckan.auth.user_delete_organizations = false
+ckan.auth.create_dataset_if_not_in_organization = False
+ckan.auth.create_unowned_dataset = False
+ckan.auth.public_activity_stream_detail = true
 ckan.favicon = /base/images/ckan.ico
 ckan.gravatar_default = identicon
 ckan.preview.direct = png jpg gif

diff --git a/stable/ckan/conf/pgbouncer/pgbouncer.ini b/stable/ckan/conf/pgbouncer/pgbouncer.ini
@@ -7,8 +7,8 @@
 listen_addr = 0.0.0.0
 auth_file = /etc/pgbouncer/userlist.txt
 auth_type = trust
-server_tls_sslmode = {{ .Values.pgbouncer.sslmode }}
-server_tls_ca_file = /etc/root.crt.pem
+server_tls_sslmode = prefer
+#server_tls_ca_file = /etc/root.crt.pem
 # These are defaults and can be configured
 # please leave them as defaults if you are
 # uncertain.

diff --git a/stable/ckan/templates/_helpers.tpl b/stable/ckan/templates/_helpers.tpl
@@ -3,7 +3,7 @@
 Expand the name of the chart.
 */}}
 {{- define "ckan.name" -}}
-{{- default .Values.nameOverride .Chart.Name | trunc 63 | trimSuffix "-" -}}
+{{- default .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*

diff --git a/stable/ckan/templates/cm/ckan-crontab.yaml b/stable/ckan/templates/cm/ckan-crontab.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.ckan.backup.enabled }}
+{{- $fullName := include "ckan.fullname" . -}}
+{{- $adminuser := .Values.ckan.backup.adminuser -}}
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ include "ckan.name" . }}-crontabs
+data:
+{{- range $key, $value := .Values.ckan.cronjobs }}
+  {{ $key }}.sh: |
+    {{ $value.command }} -c /srv/app/production.ini -O /app/backup/{{ $fullName }}-{{ $key }}-$(date +%Y-%m-%d).json1.gz -z -u {{ $adminuser }} >> /app/backup/{{ $fullName }}-{{ $key }}-$(date +%Y-%m-%d)-log.txt ;
+{{- end }}
+{{- end }}
+
diff --git a/stable/ckan/templates/cm/ckan-overlay.yaml b/stable/ckan/templates/cm/ckan-overlay.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "ckan.fullname" . }}-ini-overlay-configmap
+  name: {{ include "ckan.name" . }}-ini-overlay-configmap
 data:
   production.ini: |
 {{ .Files.Get "conf/ckan/overlay-production.ini" | indent 4 }}
diff --git a/stable/ckan/templates/cm/ckan-prerun.yaml b/stable/ckan/templates/cm/ckan-prerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "ckan.fullname" . }}-prerun-configmap
+  name: {{ include "ckan.name" . }}-prerun-configmap
 data:
   prerun.py: |
 {{ .Files.Get "conf/ckan/prerun.py" | indent 4 }}
diff --git a/stable/ckan/templates/cm/psql-init.yaml b/stable/ckan/templates/cm/psql-init.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: psql-{{ include "ckan.fullname" . }}-init-configmap
+  name: psql-{{ include "ckan.name" . }}-init-configmap
 data:
   psql-init.py: |
 {{ .Files.Get "conf/psql-init/psql-init.py" | indent 4 }}

diff --git a/stable/ckan/templates/cm/solr-configset.yaml b/stable/ckan/templates/cm/solr-configset.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: solr-{{ include "ckan.fullname" . }}-configset-configmap
+  name: solr-{{ include "ckan.name" . }}-configset-configmap
 data:
 {{ (.Files.Glob "conf/solr-init/solr-configset/*").AsConfig | indent 2 }}
 {{- end }}
diff --git a/stable/ckan/templates/cm/solr-init.yaml b/stable/ckan/templates/cm/solr-init.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: solr-{{ include "ckan.fullname" . }}-init-configmap
+  name: solr-{{ include "ckan.name" . }}-init-configmap
 data:
   solr-init.py: |
 {{ .Files.Get "conf/solr-init/solr-init.py" | indent 4 }}

diff --git a/stable/ckan/templates/cronjob/ckan.yaml b/stable/ckan/templates/cronjob/ckan.yaml
@@ -1,9 +1,5 @@
-{{- if eq .Values.ckan.activityStreamsEmailNotifications_jobs "true" -}}
-{{- if semverCompare "<1.21" .Capabilities.KubeVersion.GitVersion }}
+{{- if .Values.ckan.activityStreamsEmailNotifications_jobs -}}
 apiVersion: batch/v1beta1
-{{- else }}
-apiVersion: batch/v1
-{{- end }}
 kind: CronJob
 metadata:
   name: {{ include "ckan.name" . }}-email-notifications

diff --git a/stable/ckan/templates/deploy/ckan.yaml b/stable/ckan/templates/deploy/ckan.yaml
@@ -5,20 +5,20 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "ckan.name" . }}
     helm.sh/chart: {{ include "ckan.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ include "ckan.name" . }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "ckan.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ include "ckan.name" . }}
       tier: ckan
   template:
     metadata:
       labels:
         app.kubernetes.io/name: {{ include "ckan.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ include "ckan.name" . }}
         tier: ckan
       annotations:
     {{- with .Values.ckan.podAnnotations }}
@@ -33,6 +33,17 @@ spec:
       securityContext:
         {{- toYaml .Values.ckan.podSecurityContext | nindent 8 }}
       volumes:
+        {{- if .Values.ckan.backup.enabled }}
+        - name: "ckan-backup"
+          azureFile: 
+            secretName: {{ .Values.fullnameOverride }}-ckan-backup-secret
+            shareName: {{ .Values.ckan.backup.shareName }}
+
+        - name: {{ include "ckan.fullname" . }}-crontabs
+          configMap:
+            name: {{ include "ckan.fullname" . }}-crontabs
+            defaultMode: 0755
+        {{- end }}
         - name: {{ include "ckan.fullname" . }}-ini-overlay-configmap
           configMap:
             name: {{ include "ckan.fullname" . }}-ini-overlay-configmap
@@ -66,7 +77,7 @@ spec:
       {{ end }}
       initContainers:
       - name: create-production-ini
-        image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
+        image: busybox
         command:
         - "sh"
         - "-c"
@@ -82,7 +93,7 @@ spec:
           readOnly: false
       {{- if .Values.ckan.persistence.enabled }}
       - name: set-volume-ownership
-        image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
+        image: busybox
         command:
         - "sh"
         - "-c"
@@ -97,7 +108,7 @@ spec:
       containers:
       {{ if .Values.pgbouncer.enabled }}
         - name: pgbouncer
-          image: "{{ .Values.pgbouncer.image.repository }}:{{ .Values.pgbouncer.image.tag }}"
+          image: mcr.microsoft.com/azure-oss-db-tools/pgbouncer-sidecar:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 5432
@@ -135,7 +146,7 @@ spec:
             value: "{{ .Values.solr.initialize.maxShardsPerNode }}"
           - name: CKAN_SOLR_INIT_CONFIGSETNAME
             value: "{{ .Values.solr.initialize.configsetName }}"
-
+  
           command:
           - /bin/bash
           - -c
@@ -241,6 +252,14 @@ spec:
           - |
             set -e
             source $CKAN_VENV/bin/activate
+            sudo service cron start
+        {{- if .Values.ckan.backup.enabled }}
+            echo "#!/usr/bin/bash" | crontab -
+            (crontab -l ; echo "PATH=/usr/lib/ckan/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") | crontab -
+        {{- range $key, $value := .Values.ckan.cronjobs }}
+            (crontab -l ; echo {{ $value.crontab | quote }}) | crontab -
+        {{- end }}
+        {{- end }}
             ckan generate config /srv/app/production.ini
             python3 <<EOF | xargs -I{} ckan config-tool /srv/app/production.ini "{}"
             from ckan.config.environment import CONFIG_FROM_ENV_VARS
@@ -255,6 +274,8 @@ spec:
             ckan config-tool /srv/app/production.ini -f /config/production.ini
             ckan -c /srv/app/production.ini db init
             python3 /srv/prerun/prerun.py
+            printenv > /tmp/enviroment
+            sudo bash -c "cat /tmp/enviroment > /etc/environment"
             ckan -c /srv/app/production.ini run --host 0.0.0.0
           ports:
             - name: http
@@ -305,6 +326,8 @@ spec:
                 secretKeyRef:
                   name: {{ include "ckan.fullname" . }}
                   key: sysadminPassword
+            - name: BEAKER_SESSION_SECRET
+              value: {{ .Values.ckan.beaker_session_secret }}
             - name: CKAN_SYSADMIN_EMAIL
               value: {{ .Values.ckan.sysadminEmail }}
             - name: CKAN_SITE_TITLE
@@ -410,6 +433,12 @@ spec:
             failureThreshold: {{ .Values.ckan.liveness.failureThreshold }}
             timeoutSeconds: {{ .Values.ckan.liveness.timeoutSeconds }}
           volumeMounts:
+            {{- if .Values.ckan.backup.enabled}}
+          - mountPath: "/app/backup"
+            name: "ckan-backup"
+          - name: {{ include "ckan.fullname" . }}-crontabs
+            mountPath: /app/
+            {{- end }}
           - name: {{ include "ckan.fullname" . }}-prerun-configmap
             mountPath: /srv/prerun
           - name: {{ include "ckan.fullname" . }}-ini-overlay-configmap

diff --git a/stable/ckan/templates/secret/ckan-backup-secret.yaml b/stable/ckan/templates/secret/ckan-backup-secret.yaml
@@ -0,0 +1,10 @@
+{{- if .Values.ckan.backup.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.fullnameOverride }}-ckan-backup-secret
+type: Opaque
+data:
+  azurestorageaccountname: {{ .Values.ckan.backup.azurestorageaccountname | b64enc }}  
+  azurestorageaccountkey: {{ .Values.ckan.backup.azurestorageaccountkey | b64enc }}
+{{- end }}