proper path

.gitea/workflows/release-charts-cloudflared.yml

@@ -5,10 +5,13 @@ on:
     branches:
       - main
     paths:
-      - "charts/cloudflared"
+      - "charts/cloudflared/**"
 
   workflow_dispatch:
 
+env:
+  WORKFLOW_DIR: "charts/cloudflared"
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -21,25 +24,34 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
-          cd charts/cloudflared
+          cd $WORKFLOW_DIR
+          helm dependency build
           echo "PACKAGE_PATH=$(helm package . | awk '{print $NF}')" >> $GITEA_ENV
 
       - name: Publish Helm Chart to Harbor
         run: |
           helm registry login ${{ vars.REGISTRY_HOST }} -u ${{ vars.REGISTRY_USER }} -p ${{ secrets.REGISTRY_SECRET }}
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_USER }}
+          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/helm-charts
 
       - name: Publish Helm Chart to Gitea
         run: |
-          helm registry login ${{ vars.REPOSITORY_HOST }} -u ${{ github.actor }} -p ${{ secrets.REPOSITORY_TOKEN }}
+          helm plugin install https://github.com/chartmuseum/helm-push
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REPOSITORY_HOST }}/${{ github.actor }}
+          helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
+          helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
+
+      - name: Extract Chart Metadata
+        run: |
+          cd $WORKFLOW_DIR
+          echo "CHART_VERSION=$(yq '.version' Chart.yaml)" >> $GITEA_ENV
+          echo "CHART_NAME=$(yq '.name' Chart.yaml)" >> $GITEA_ENV
 
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
+          tag_name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
           files: |-
             ${{ env.PACKAGE_PATH }}

.gitea/workflows/release-charts-generic-device-plugin.yml

@@ -5,10 +5,13 @@ on:
     branches:
       - main
     paths:
-      - "charts/generic-device-plugin"
+      - "charts/generic-device-plugin/**"
 
   workflow_dispatch:
 
+env:
+  WORKFLOW_DIR: "charts/generic-device-plugin"
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -21,25 +24,34 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
-          cd charts/generic-device-plugin
+          cd $WORKFLOW_DIR
+          helm dependency build
           echo "PACKAGE_PATH=$(helm package . | awk '{print $NF}')" >> $GITEA_ENV
 
       - name: Publish Helm Chart to Harbor
         run: |
           helm registry login ${{ vars.REGISTRY_HOST }} -u ${{ vars.REGISTRY_USER }} -p ${{ secrets.REGISTRY_SECRET }}
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_USER }}
+          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/helm-charts
 
       - name: Publish Helm Chart to Gitea
         run: |
-          helm registry login ${{ vars.REPOSITORY_HOST }} -u ${{ github.actor }} -p ${{ secrets.REPOSITORY_TOKEN }}
+          helm plugin install https://github.com/chartmuseum/helm-push
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REPOSITORY_HOST }}/${{ github.actor }}
+          helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
+          helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
+
+      - name: Extract Chart Metadata
+        run: |
+          cd $WORKFLOW_DIR
+          echo "CHART_VERSION=$(yq '.version' Chart.yaml)" >> $GITEA_ENV
+          echo "CHART_NAME=$(yq '.name' Chart.yaml)" >> $GITEA_ENV
 
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
+          tag_name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
           files: |-
             ${{ env.PACKAGE_PATH }}

.gitea/workflows/release-charts-postgres-cluster.yml

@@ -5,10 +5,13 @@ on:
     branches:
       - main
     paths:
-      - "charts/postgres-cluster"
+      - "charts/postgres-cluster/**"
 
   workflow_dispatch:
 
+env:
+  WORKFLOW_DIR: "charts/postgres-cluster"
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -21,25 +24,34 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
-          cd charts/postgres-cluster
+          cd $WORKFLOW_DIR
+          helm dependency build
           echo "PACKAGE_PATH=$(helm package . | awk '{print $NF}')" >> $GITEA_ENV
 
       - name: Publish Helm Chart to Harbor
         run: |
           helm registry login ${{ vars.REGISTRY_HOST }} -u ${{ vars.REGISTRY_USER }} -p ${{ secrets.REGISTRY_SECRET }}
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_USER }}
+          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REGISTRY_HOST }}/helm-charts
 
       - name: Publish Helm Chart to Gitea
         run: |
-          helm registry login ${{ vars.REPOSITORY_HOST }} -u ${{ github.actor }} -p ${{ secrets.REPOSITORY_TOKEN }}
+          helm plugin install https://github.com/chartmuseum/helm-push
-          helm push ${{ env.PACKAGE_PATH }} oci://${{ vars.REPOSITORY_HOST }}/${{ github.actor }}
+          helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
+          helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
+
+      - name: Extract Chart Metadata
+        run: |
+          cd $WORKFLOW_DIR
+          echo "CHART_VERSION=$(yq '.version' Chart.yaml)" >> $GITEA_ENV
+          echo "CHART_NAME=$(yq '.name' Chart.yaml)" >> $GITEA_ENV
 
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
+          tag_name: ${{ env.CHART_NAME }}-${{ env.CHART_VERSION }}
           files: |-
             ${{ env.PACKAGE_PATH }}

charts/generic-device-plugin/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: generic-device-plugin
-version: 0.1.9
+version: 0.1.10
 description: Generic Device Plugin
 keywords:
   - generic-device-plugin
@@ -14,5 +14,5 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s.github.io/helm-charts/
-    version: 3.7.2
+    version: 3.7.3
-appVersion: 0.1.9
+appVersion: 0.1.10

charts/generic-device-plugin/README.md

@@ -1,6 +1,6 @@
 # generic-device-plugin
 
-![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![AppVersion: 0.1.9](https://img.shields.io/badge/AppVersion-0.1.9-informational?style=flat-square)
+![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![AppVersion: 0.1.10](https://img.shields.io/badge/AppVersion-0.1.10-informational?style=flat-square)
 
 Generic Device Plugin
 
@@ -19,7 +19,7 @@ Generic Device Plugin
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://bjw-s.github.io/helm-charts/ | common | 3.7.2 |
+| https://bjw-s.github.io/helm-charts/ | common | 3.7.3 |
 
 ## Values