Disabled job template

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.6.3"
+  HELM_CHART_VERSION: "0.6.13"
 
 stages:
   - deploy

Chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: wordyne
 description: Helm chart for deploying pre-built website containers to kubernetes clusters
 type: application
-version: "0.5.3"
+version: "0.6.13"
 appVersion: "6.2.2"

Chart/templates-disabled/job.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.site.skipWPCRegistration | default false }}
+{{- else }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "..fullname" . }}-wpc-reg
+  labels:
+    {{- include "..labels" . | nindent 4 }}
+    cloudyne.systems/component: site
+spec:
+  template:
+    spec:
+      containers:
+      - name: register-wpc
+        image: cloudyne.azurecr.io/register-wpc:latest
+        command: ["python3",  "/app/register-wpc.py"]
+        env:
+        - name: WP_HOME
+          value: "https://{{ ( .Values.site.redirectDomain | default ( .Values.site.domain )) | replace "https://" "" | replace "http://" "" }}"
+      restartPolicy: Never
+      imagePullSecrets:
+        - name: pull-secret
+  backoffLimit: 4
+{{- end }}

Chart/templates/configmap.yaml

@@ -24,7 +24,7 @@ data:
         {{- end }}
     WP_ENV: "{{ .Values.site.environment | default "production" }}"
     WP_HOME: "https://{{ ( .Values.site.redirectDomain | default ( .Values.site.domain )) | replace "https://" "" | replace "http://" "" }}"
-    {{- if .Values.site.additional_env }}
+    {{- if .Values.site.additionalEnv }}
         {{- range $k, $v := .Values.site.additionalEnv }}
     {{ $k }}: {{ $v }}
         {{- end }}
@@ -50,7 +50,7 @@ data:
             "overwriteDatabase": {{ .Values.database.overwrite | default false }},
             "generateSalts": true,
             "activateTheme": "{{ .Values.site.theme | default .Values.site.name }}",
-            "convertUploadsToWebp": "{{ .Values.site.enableWebpConversion | default false }}",
+            "convertUploadsToWebp": {{ .Values.site.enableWebpConversion | default false }},
             "convertMissingOnly": true
         }
 

Chart/templates/externalsecret.yaml

@@ -12,6 +12,10 @@ spec:
   target:
     name: global-secrets
     creationPolicy: Orphan
+    template:
+      metadata:
+        labels:
+          app.kubernetes.io/managed-by: External-Secrets
   data:
     - secretKey: COMPOSER_AUTH
       remoteRef:
@@ -25,6 +29,9 @@ spec:
     - secretKey: SMTP_HOST
       remoteRef:
         key: secret/SMTP-HOST
+    - secretKey: WPC_REGISTRATION_SECRET
+      remoteRef:
+        key: secret/WPC-REGISTRATION-SECRET
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
@@ -40,6 +47,9 @@ spec:
   target:
     name: pull-secret
     template:
+      metadata:
+        labels:
+          app.kubernetes.io/managed-by: External-Secrets
       type: kubernetes.io/dockerconfigjson
       data:
         .dockerconfigjson: "{{`{{ .dockerconfig | toString }}`}}"

Chart/values.yaml

@@ -49,6 +49,10 @@ storage:
   # Default: <domain>-<tld>
   # container: "company-tld"
 
+  # Skip WPC Auto-registration
+  # Default: false
+  # skipWPCRegistration: false
+
   # WP Content Folders
   wpContent:
     - uploads