Updated

.gitea/workflows/upload-helm.yml

@@ -4,9 +4,9 @@ on: [push]
 
 jobs:
   Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
+    runs-on: shell
     env:
-      HELM_CHART_VERSION: "1.1.2"
+      HELM_CHART_VERSION: "1.0.24"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Helm
@@ -15,9 +15,10 @@ 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 -ki -X POST \
+          curl --request 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
+          --form "chart=@wordyne-${HELM_CHART_VERSION}.tgz" \
+          https://git.cloudyne.io/api/packages/helm/helm/api/charts

.gitignore

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

.gitlab-ci.yml

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

Chart/templates/deployment.yaml

@@ -99,31 +99,25 @@ 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 }}
           
           envFrom:
             - configMapRef:
@@ -151,37 +145,25 @@ 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 }}
           {{- include "..resourcelimits" . | nindent 10 }}
           envFrom:
             - configMapRef:

Chart/templates/job.yaml

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

Chart/values.yaml

@@ -81,12 +81,12 @@ secrets:
 
 storage:
   kubernetes:
-    # - name: "pull-secret"
-    #   type: "secret"
-    #   files:
-    #     - name: .dockerconfigjson
-    #       content: |
-    #         {"auths":{"ghcr.io":{"username":"ghcr.io","password":"ghcr.io","auth":"ghcr.io"}}}
+    - name: "pull-secret"
+      type: "secret"
+      files:
+        - name: .dockerconfigjson
+          content: |
+            {"auths":{"ghcr.io":{"username":"ghcr.io","password":"ghcr.io","auth":"ghcr.io"}}}
     # - name: "secret01"
     #   type: "secret"
     #   files:
@@ -140,17 +140,6 @@ 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