Dev-newchart

Fixed default for additional domains

.gitea/workflows/upload-helm.yml

@@ -4,9 +4,9 @@ on: [push]
 
 jobs:
   Explore-Gitea-Actions:
-    runs-on: shell
+    runs-on: ubuntu-latest
     env:
-      HELM_CHART_VERSION: "1.0.24"
+      HELM_CHART_VERSION: "1.0.34"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Helm
@@ -15,10 +15,9 @@ jobs:
           version: 'v3.0.0'
       - run: 'sed -i "s/version:.*/version: \"${HELM_CHART_VERSION}\"/" ./Chart/Chart.yaml'
       - run: helm package ./Chart
-      - run: echo ${{ secrets.GITEA_TOKEN }} > /tmp/gitea-token
       - name: Upload Helm Chart
         run: |
-          curl --request POST \
+          curl -ki -X POST \
           --user ${{ secrets.HELM_PKG_UPLOAD_USER }}:${{ secrets.HELM_PKG_UPLOAD_PASS }} \
-          --form "chart=@wordyne-${HELM_CHART_VERSION}.tgz" \
+          --upload-file "wordyne-${HELM_CHART_VERSION}.tgz" \
-          https://git.cloudyne.io/api/packages/helm/helm/api/charts
+          https://helm.cloudyne.io/api/charts

.gitignore

@@ -1,2 +1,4 @@
 example.yaml
-example*.yaml
+example*.yaml
+example*.yml
+test-*.yaml

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.6.13"
+  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: "1.0.24"
+version: "1.0.27"
 appVersion: "6.2.2"

Chart/templates/deployment.yaml

@@ -99,16 +99,16 @@ 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 }}
@@ -145,22 +145,34 @@ spec:
             - 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 }}
@@ -181,4 +193,4 @@ spec:
           ports:
             - containerPort: 8080
               name: http
-              protocol: TCP
+              protocol: TCP

Chart/templates/job.yaml

@@ -1,3 +1,4 @@
+#dev-newchart
 {{- if .Values.init.asJob }}
 apiVersion: batch/v1
 kind: Job
@@ -93,16 +94,16 @@ 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 }}