Fix unquoted certificates error

.gitea/workflows/upload-helm.yml

@@ -0,0 +1,23 @@
+name: Upload Helm Chart
+run-name: Uploading helm chart
+on: [push]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    env:
+      HELM_CHART_VERSION: "1.1.2"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: 'v3.0.0'
+      - run: 'sed -i "s/version:.*/version: \"${HELM_CHART_VERSION}\"/" ./Chart/Chart.yaml'
+      - run: helm package ./Chart
+      - name: Upload Helm Chart
+        run: |
+          curl -ki -X POST \
+          --user ${{ secrets.HELM_PKG_UPLOAD_USER }}:${{ secrets.HELM_PKG_UPLOAD_PASS }} \
+          --upload-file "wordyne-${HELM_CHART_VERSION}.tgz" \
+          https://helm.cloudyne.io/api/charts

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "1.0.16"
+  HELM_CHART_VERSION: "1.0.24"
 
 stages:
   - deploy
@@ -9,9 +9,7 @@ default:
     name: cloudyne/kubectl-helm:latest
     entrypoint: [""]
   tags:
-    - build01
+    - shell
-    - helm
-    - chartbuild
 
 deploy:
   stage: 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: "99.6.29"
+version: "1.0.27"
 appVersion: "6.2.2"

Chart/templates/_helpers.tpl

@@ -48,25 +48,25 @@ cloudyne.systems/site: {{ .Values.site.domain | quote }}
 {{- end }}
 {{- define "..selector-labels" -}}
 cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
-cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
 cloudyne.systems/site: {{ .Values.site.domain | quote }}
+cloudyne.systems/component: site
 {{- end }}
 {{- define "..affinity-labels" -}}
 podAffinity:
   requiredDuringSchedulingIgnoredDuringExecution:
     - labelSelector:
         matchExpressions:
-          - key: cloudyne.systems/customer
+        - key: cloudyne.systems/customer
-            operator: In
+          operator: In
-            values:
+          values:
-              - {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
+          - {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
-          - key: cloudyne.systems/site
+        - key: cloudyne.systems/site
-            operator: In
+          operator: In
-            values:
+          values:
-              - cloudyne.systems/site: {{ .Values.site.domain | quote }}
+          - {{ .Values.site.domain | quote }}
-          - key: cloudyne.systems/component
+        - key: cloudyne.systems/component
-            operator: In
+          operator: In
-            values:
+          values:
-              - "site"
+          - "site"
       topologyKey: kubernetes.io/hostname
 {{- end }}

Chart/templates/configmap.yaml

@@ -69,7 +69,16 @@ data:
             "overwriteDatabase": {{ .Values.init.db.overwrite | default false }},
             "generateSalts": true,
             "activateTheme": "{{ .Values.init.wp.theme | default .Values.site.name }}",
+            {{- if .Values.init.asJob }}
+            "convertUploadsToWebp": {{ .Values.init.content.webpConverter | default true }},
+            {{- else }}
             "convertUploadsToWebp": {{ .Values.init.content.webpConverter | default false }},
+            {{- end }}
+            {{- if and .Values.storage.cloud.active .Values.storage.local.active }}
+            "backupToCloud": true,
+            {{- else }}
+            "backupToCloud": false,
+            {{- end }}
             "convertMissingOnly": true
         }
 

Chart/templates/deployment.yaml

@@ -4,7 +4,6 @@ metadata:
   name: {{ include "..fullname" . }}
   labels:
     {{- include "..labels" . | nindent 4 }}
-    cloudyne.systems/component: site
 spec:
   {{- if .Values.site.resources }}
   replicas: {{ .Values.site.resources.replicas | default 1 }}
@@ -12,10 +11,12 @@ spec:
   replicas: 1
   {{- end }}
   selector:
-    matchLabels: {{- include "..selector-labels" . | nindent 6 }}
+    matchLabels: 
+      {{- include "..selector-labels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{- include "..selector-labels" . | nindent 8 }}
+      labels:
+        {{- include "..selector-labels" . | nindent 8 }}
     spec:
       securityContext:
         fsGroup: 101
@@ -98,23 +99,29 @@ spec:
             - name: serverconfig
               mountPath: /init-go/config.json
               subPath: init.json
+            {{- if .Values.storage.cloud.active }}
+            - name: cloud
+              mountPath: "/mnt/cloud"
+            {{- end }}
             {{- if .Values.storage.local.active }}
             {{- range .Values.storage.folders }}
             - name: local
               mountPath: "/app/web/app/{{ . }}"
               subPath: "{{ . }}"
             {{- end }}
-            {{- if .Values.storage.cloud.active }}
-            - name: cloud
-              mountPath: "/mnt/cloud"
-            {{- end }}
             {{- else }}
               {{- if .Values.storage.cloud.active }}
                 {{- range .Values.storage.folders }}
+                {{- if or ( eq . "certificates" ) ( eq . "secrets" ) }}
+            - name: local
+              mountPath: "/app/{{ . }}"
+              subPath: "{{ . }}"
+                    {{- else }}
             - name: cloud
               mountPath: "/app/web/app/{{ . }}"
               subPath: "{{ . }}"
                 {{- end }}
+                {{- end }}
               {{- end }}
             {{- end }}
           
@@ -139,27 +146,39 @@ spec:
           securityContext:
             runAsUser: 101
           image: "{{ .Values.site.image }}"
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           volumeMounts:
             - name: serverconfig 
               mountPath: /docker-entrypoint.d/unit.json
               subPath: unit.json
-            {{- if .Values.storage.local.active }}
-            {{- range .Values.storage.folders }}
-            - name: local
-              mountPath: "/app/web/app/{{ . }}"
-              subPath: "{{ . }}"
-            {{- end }}
             {{- if .Values.storage.cloud.active }}
             - name: cloud
               mountPath: "/mnt/cloud"
             {{- end }}
+            {{- if .Values.storage.local.active }}
+              {{- range .Values.storage.folders }}
+                {{- if or ( eq . "certificates" ) ( eq . "secrets" ) }}
+            - name: local
+              mountPath: "/app/{{ . }}"
+              subPath: "{{ . }}"
+                {{- else }}
+            - name: local
+              mountPath: "/app/web/app/{{ . }}"
+              subPath: "{{ . }}"
+                {{- end }}
+              {{- end }}
             {{- else }}
               {{- if .Values.storage.cloud.active }}
                 {{- range .Values.storage.folders }}
+                  {{- if or ( eq . "certificates" ) ( eq . "secrets" ) }}
+            - name: cloud
+              mountPath: "/app/{{ . }}"
+              subPath: "{{ . }}"
+                  {{- else }}
             - name: cloud
               mountPath: "/app/web/app/{{ . }}"
               subPath: "{{ . }}"
+                  {{- end }}
                 {{- end }}
               {{- end }}
             {{- end }}

Chart/templates/job.yaml

@@ -1,14 +1,17 @@
+#dev-newchart
 {{- if .Values.init.asJob }}
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "..fullname" . }}-wpc-reg
+  name: {{ include "..fullname" . }}-initializer
   labels:
     {{- include "..labels" . | nindent 4 }}
     cloudyne.systems/component: site-init
 spec:
+  backoffLimit: 2
   template:
     spec:
+      restartPolicy: "OnFailure"
       affinity: {{ include "..affinity-labels" . | nindent 8 }}
       securityContext:
         fsGroup: 101
@@ -86,21 +89,21 @@ spec:
             allowPrivilegeEscalation: false
             runAsUser: 0
           image: "{{ .Values.site.image }}"
-          imagePullPolicy: Always
+          imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: serverconfig
               mountPath: /init-go/config.json
               subPath: init.json
+            {{- if .Values.storage.cloud.active }}
+            - name: cloud
+              mountPath: "/mnt/cloud"
+            {{- end }}
             {{- if .Values.storage.local.active }}
             {{- range .Values.storage.folders }}
             - name: local
               mountPath: "/app/web/app/{{ . }}"
               subPath: "{{ . }}"
             {{- end }}
-            {{- if .Values.storage.cloud.active }}
-            - name: cloud
-              mountPath: "/mnt/cloud"
-            {{- end }}
             {{- else }}
               {{- if .Values.storage.cloud.active }}
                 {{- range .Values.storage.folders }}

Chart/values.yaml

@@ -81,12 +81,12 @@ secrets:
 
 storage:
   kubernetes:
-    - name: "pull-secret"
+    # - name: "pull-secret"
-      type: "secret"
+    #   type: "secret"
-      files:
+    #   files:
-        - name: .dockerconfigjson
+    #     - name: .dockerconfigjson
-          content: |
+    #       content: |
-            {"auths":{"ghcr.io":{"username":"ghcr.io","password":"ghcr.io","auth":"ghcr.io"}}}
+    #         {"auths":{"ghcr.io":{"username":"ghcr.io","password":"ghcr.io","auth":"ghcr.io"}}}
     # - name: "secret01"
     #   type: "secret"
     #   files:
@@ -140,6 +140,17 @@ init:
     # url: "https://url.to/content.zip"
 
 email:
+  relay:
+    enabled: false
+    relayName: "smtp-relay"
+    relayHost: "relay.domain.com"
+    relayPort: 2525
+    # Generate automatically
+    # relayUser: "relayuser"
+    # relayPassword: "relaypassword"
+
+
+
   smtpHost: ""
   smtpPort: ""
   smtpAuth: false