.gitea/workflows/update-docs.yml

@@ -4,13 +4,14 @@ on:
   push:
     branches:
       - main
+      - develop
     paths:
       - '.docs/**'
 
 env: 
   DOCKER_REGISTRY: registry.dutchie031.net
   DOCKER_IMAGE: spearhead-docs
-  DOCKER_TAG: latest
+  DOCKER_TAG: ${{ github.ref_name == 'main' && 'latest' || 'beta' }}
 
 jobs:
   ## Run replacements and cleanups on the docs
@@ -36,7 +37,7 @@ jobs:
           sed -i '/@@API_CODE@@/d' .docs/web/pages/spearheadapi.html
           rm .docs/web/pages/temp_api_code.html
 
-      - name: Highlight API code and update HTML
+      - name: Highlight Config code and update HTML
         run: |
           pygmentize -f html -l lua -O noclasses,style=monokai ./config.lua > .docs/web/pages/temp_config_code.html
           # Insert the highlighted code into the placeholder in spearheadapi.html
@@ -105,15 +106,30 @@ jobs:
           chmod 600 $HOME/.kube/config
           cat $HOME/.kube/config
 
-      - name: Run Helm upgrade/install
+      - name: Run Helm upgrade/install spearhead-docs (main)
+        if: github.ref_name == 'main'
         run: |
           helm upgrade --install spearhead-docs .helm \
             --namespace spearhead-docs \
             --create-namespace \
+            -f .helm/values.yaml \
             --set image.repository=${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }} \
             --set image.tag=${{ env.DOCKER_TAG }} \
             --wait
 
+      - name: Run Helm upgrade/install spearhead-docs (develop)
+        if: github.ref_name == 'develop'
+        run: |
+          helm upgrade --install spearhead-docs .helm \
+            --namespace spearhead-docs \
+            --create-namespace \
+            -f .helm/values.yaml \
+            -f .helm/values.beta.yaml \
+            --set image.repository=${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }} \
+            --set image.tag=${{ env.DOCKER_TAG }} \
+            --wait
+            
+
       # - name: 'Deploy'
       #   uses: deliverybot/helm@v1
       #   with: 

.helm/Chart.yaml

@@ -13,4 +13,5 @@ sources:
   - https://git.dutchie031.com/Spearhead/Spearhead
 maintainers:
   - name: Spearhead Team
+
     

.helm/templates/deployment.yaml

@@ -25,7 +25,7 @@ spec:
           type: RuntimeDefault
       containers:
         - name: {{ .Values.app }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: Always
           ports:
             - containerPort: {{ .Values.ports.containerPort }}

.helm/templates/network.yaml

@@ -14,7 +14,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Values.app }}-ingress
+  name: "{{ .Values.app }}-ingress"
   namespace: spearhead-docs
   annotations:
     kubernetes.io/tls-acme: "true"
@@ -22,28 +22,21 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: spearhead.dutchie031.com
+    {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
       http:
         paths:
           - path: /
             pathType: Prefix
             backend:
               service:
-                name: {{ .Values.app }}
+                name: {{ $.Values.app }}
                 port:
-                  number: {{ .Values.ports.servicePort }}
+                  number: {{ $.Values.ports.servicePort }}
-    - host: spearhead.rocks
+    {{- end }}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ .Values.app }}
-                port:
-                  number: {{ .Values.ports.servicePort }}
   tls:
     - hosts:
-        - spearhead.dutchie031.com
+        {{- range .Values.ingress.hosts }}
-        - spearhead.rocks
+        - {{ . }}
-      secretName: spearhead-docs-tls
+        {{- end }}
+      secretName: "{{ .Values.app }}-docs-tls"

.helm/values.beta.yaml

@@ -0,0 +1,9 @@
+
+app: spearhead-docs-beta
+
+image:
+  tag: "beta"
+
+ingress:
+  hosts: 
+    - beta.spearhead.rocks

.helm/values.yaml

@@ -1,10 +1,15 @@
-
+
-app: spearhead-docs
+app: spearhead-docs
-
+
-image: 
+image: 
-  repository: registry.dutchie031.net/spearhead-docs
+  repository: registry.dutchie031.net/spearhead-docs
-  tag: latest
+  tag: latest
-
+
-ports:
+ports:
-  servicePort: 80
+  servicePort: 80
-  containerPort: 80
+  containerPort: 80
+
+ingress:
+  hosts: 
+    - spearhead.dutchie031.com
+    - spearhead.rocks