Merge pull request #211 from openziti/add-helm-repo-deps

resume adding Helm repo deps before packaging charts
openziti · Jun 4, 2024 · c14f959 · c14f959
2 parents 6b712d8 + 199acff
commit c14f959
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/release.charts.yml b/.github/workflows/release.charts.yml
@@ -15,22 +15,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      # - name: Install Helm
-      #   uses: azure/setup-helm@v4
-      #   with:
-      #     version: v3.15.1
+      - name: Install Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: v3.15.1
 
-      # - name: Add Helm repositories required to install dependencies
-      #   run: |
-      #     while read -r DEP_REPO; do
-      #       helm repo add "${DEP_REPO//(https:\/\/|\/)/_}" "${DEP_REPO}"
-      #     done < <(
-      #       for CHART_DIR in $(find ./charts -mindepth 2 -maxdepth 2 -type f -name Chart.yaml -exec dirname {} \;); do
-      #         if [ -f "${CHART_DIR}/Chart.lock" ]; then
-      #           awk '/repository:/ {print $2}' "./${CHART_DIR}/Chart.lock"
-      #         fi
-      #       done | sort -u
-      #     )
+      - name: Add dependency repositories
+        run: |
+          for dir in $(ls -d charts/*/); do
+            helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "helm repo add " $1 " " $3 }' | while read cmd; do $cmd; done
+          done
 
       - name: Configure Git for Chart Releaser
         run: |

diff --git a/charts/ziti-controller/Chart.yaml b/charts/ziti-controller/Chart.yaml
@@ -16,4 +16,4 @@ dependencies:
 description: Host an OpenZiti controller in Kubernetes
 name: ziti-controller
 type: application
-version: 1.0.2
+version: 1.0.3
diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md
@@ -2,7 +2,7 @@
 
 # ziti-controller
 
-![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 Host an OpenZiti controller in Kubernetes