Small fixes and improvements (#22)

Haloghen · web-flow · commit b74e0d964617 · 2022-11-11T17:57:02.000+01:00
* Minor fixed and workflow changes

- Bumped all charts
- Updated workflow to use GH pages again
- Updated foundry-vtt CI values to use dnsConfig
- Fixed small non-breaking mistake in foundry-vtt deployment
- Updated helm homepage with current chart versions

* Fixed missing newline

* Split lint and install into 2 jobs

* Trigger workflows on workflow file change

* Fixed lint job

* Disabled PSP by default since it is now deprecated
diff --git a/.github/workflows/chart-workflow.yaml b/.github/workflows/chart-workflow.yaml
@@ -3,13 +3,15 @@ on:
   push:
     paths:
       - charts/**
+      - .github/workflows/**
   pull_request:
     paths:
       - charts/**
+      - .github/workflows/**
 
 jobs:
-  lint-test:
-    name: "Lint and Test"
+  lint-charts:
+    name: Lint Charts
     runs-on: ubuntu-22.04
     steps:
       - name: "Checkout"
@@ -55,45 +57,98 @@ jobs:
         run: ct lint --config ct.yaml
         if: steps.list-changed.outputs.changed == 'true' && github.ref != 'refs/heads/main'
 
+  install-charts:
+    name: Install Charts
+    runs-on: ubuntu-22.04
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2.4.2
+        with:
+          fetch-depth: 0
+
+      - name: "Set Up Helm"
+        uses: azure/setup-helm@v3.3
+        if: github.ref != 'refs/heads/main'
+        with:
+          version: v3.4.1
+
+      - name: "Set Up Python"
+        uses: actions/setup-python@v4.2.0
+        if: github.ref != 'refs/heads/main'
+        with:
+          python-version: 3.9
+
+      - name: "Set up chart-testing"
+        uses: helm/chart-testing-action@v2.3.0
+        if: github.ref != 'refs/heads/main'
+        with:
+          version: v3.3.0
+
+      - name: "Save Testing Values from Secret"
+        shell: bash
+        env:
+          SECRET_VALUES: ${{ secrets.FOUNDRY_SECRET_VALUES }}
+        run: echo "$SECRET_VALUES" | base64 -d > ./charts/foundry-vtt/ci/test-values.yaml
+        if: github.ref != 'refs/heads/main'
+
+      - name: "Run chart-testing (list-changed)"
+        id: list-changed
+        if: github.ref != 'refs/heads/main'
+        run: |
+          changed=$(ct list-changed --config ct.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+
       - name: Create kind cluster
         uses: helm/kind-action@v1.4.0
         if: steps.list-changed.outputs.changed == 'true' && github.ref != 'refs/heads/main'
 
       - name: Run chart-testing (install)
-        run: ct install --config ct.yaml
+        run: ct install --config ct.yaml --debug
         if: steps.list-changed.outputs.changed == 'true' && github.ref != 'refs/heads/main'
 
-      - name: Get Branch name
-        id: branch-name
-        uses: tj-actions/branch-names@v6
-        if: github.ref != 'refs/heads/main'
-
-  release_on_nexus:
+  release-on-nexus:
     name: Release Chart on Nexus
     runs-on: ubuntu-22.04
-    needs: lint-test
+    needs:
+      - lint-charts
+      - install-charts
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
+          submodule: recursive
           fetch-depth: 0
 
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-      - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.4.0
-
       - name: Run chart-releaser
-        uses: ntwklr/nexus-helm-chart-releaser-action@v0.0.5
+        uses: helm/chart-releaser-action@v1.1.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: 'latest'
+
+      - name: Build Hugo
+        run: |
+          git submodule init
+          git submodule update
+          cd hugo
+          hugo --minify
+          cp -r ./public ../public
+          cd ..
+
+      - name: Deploy Hugo
+        uses: peaceiris/actions-gh-pages@v3
         with:
-          charts_repo_url: https://repo.mahahe.it/repository/helm/
-          username: "${{ secrets.NEXUS_USERNAME }}"
-          password: "${{ secrets.NEXUS_PASSWORD }}"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public
+          cname: helm.mahahe.it
+          keep_files: true
diff --git a/charts/foundry-vtt/Chart.yaml b/charts/foundry-vtt/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: foundry-vtt
 description: Foundry Virtual Tabletop
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: "v10.288"
 keywords:
   - game
diff --git a/charts/foundry-vtt/ci/test-values.yaml b/charts/foundry-vtt/ci/test-values.yaml
@@ -4,3 +4,7 @@ foundryvtt:
   password: "password"
 persistence:
   enabled: false
+dnsConfig:
+  options:
+    - name: ndots
+      value: "1"
diff --git a/charts/foundry-vtt/templates/deployment.yaml b/charts/foundry-vtt/templates/deployment.yaml
@@ -24,8 +24,10 @@ spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       dnsPolicy: "ClusterFirst"
+      {{- if .Values.dnsConfig }}
       dnsConfig:
-        {{- toYaml .Values.dnsConfig | indent 6 }}
+        {{- toYaml .Values.dnsConfig | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
diff --git a/charts/prometheus-haproxy-exporter/Chart.yaml b/charts/prometheus-haproxy-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus-haproxy-exporter
 description: A Helm chart to export the metrics from haproxy in Prometheus format.
-version: 0.1.3
+version: 0.1.4
 appVersion: "v0.13.0"
 keywords:
 - haproxy-exporter
diff --git a/charts/prometheus-haproxy-exporter/values.yaml b/charts/prometheus-haproxy-exporter/values.yaml
@@ -7,7 +7,7 @@
 ## @param rbac.pspEnabled Specifies whether a PodSecurityPolicy should be created
 rbac:
   create: true
-  pspEnabled: true
+  pspEnabled: false
 
 ## @section serviceAccount
 ## @param serviceAccount.create Specifies whether a ServiceAccount should be created
diff --git a/charts/prometheus-pve-exporter/Chart.yaml b/charts/prometheus-pve-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: prometheus-pve-exporter
 description: A Helm chart to export the metrics from pve in Prometheus format.
-version: 0.1.14
+version: 0.1.15
 appVersion: "2.2.3"
 keywords:
 - pve-exporter
diff --git a/charts/prometheus-pve-exporter/values.yaml b/charts/prometheus-pve-exporter/values.yaml
@@ -6,7 +6,7 @@ rbac:
   # Specifies whether RBAC resources should be created
   create: true
   # Specifies whether a PodSecurityPolicy should be created
-  pspEnabled: true
+  pspEnabled: false
 
 serviceAccount:
   # Specifies whether a ServiceAccount should be created
diff --git a/charts/youtrack/Chart.yaml b/charts/youtrack/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: youtrack
 description: A Helm chart to install YouTrack in your Kubernetes Cluster
-version: 0.1.8
+version: 0.1.9
 appVersion: "2022.2"
 keywords:
 - youtrack
diff --git a/hugo/content/index.md b/hugo/content/index.md
@@ -14,9 +14,10 @@ Welcome to the Official MaHaHe Helm Repository! Here you will find various appli
 
 The Applications we offer at the moment are listed down here. Watch this website often to discover new applications and new versions for them.
 
- - ```Prometheus PVE Exporter@0.1.10```
- - ```Prometheus Haproxy Exporter@0.1.1```
- - ```YouTrack@0.1.3```
+ - ```Prometheus PVE Exporter@0.1.14```
+ - ```Prometheus Haproxy Exporter@0.1.3```
+ - ```YouTrack@0.1.8```
+ - ```FoundryVTT@0.1.1```
 
 #### License
 
