From 27cdcce4f127c29b1d4d25d9a7228f20891757ca Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 3 Apr 2022 10:55:01 +0200
Subject: [PATCH] fix(ci): try to also fix catalog build process

---
 .github/scripts/build-catalog.sh       | 58 +++++++++-----------------
 .github/workflows/charts-release.yaml  | 16 ++++++-
 charts/dependency/mariadb/Chart.yaml   |  2 +-
 charts/dependency/memcached/Chart.yaml |  2 +-
 4 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/.github/scripts/build-catalog.sh b/.github/scripts/build-catalog.sh
index 8bc115fb1a6..bb347f7f446 100755
--- a/.github/scripts/build-catalog.sh
+++ b/.github/scripts/build-catalog.sh
@@ -3,30 +3,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-chart_runner(){
-  if [[ -d "charts/${1}" ]]; then
-      echo "Start processing charts/${1} ..."
-      chartversion=$(cat charts/${1}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
-      chartname=$(basename charts/${1})
-      train=$(basename $(dirname "charts/${1}"))
-      SCALESUPPORT=$(cat charts/${1}/Chart.yaml | yq '.annotations."truecharts.org/SCALE-support"' -r)
-      helm dependency update "charts/${1}" --skip-refresh || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh)
-      if [[ "${SCALESUPPORT}" == "true" ]]; then
-        clean_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
-        copy_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
-        patch_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
-        include_questions "charts/${1}" "${chartname}" "$train" "${chartversion}"
-        clean_catalog "charts/${1}" "${chartname}" "$train" "${chartversion}"
-      else
-        echo "Skipping chart charts/${1}, no correct SCALE compatibility layer detected"
-      fi
-  else
-      echo "Chart 'charts/${1}' no longer exists in repo. Skipping it..."
-  fi
-  echo "Done processing charts/${1} ..."
-}
-export -f chart_runner
-
 include_questions(){
     local chart="$1"
     local chartname="$2"
@@ -185,16 +161,6 @@ clean_catalog() {
     }
 export -f clean_catalog
 
-gen_dh_cat() {
-    rm -rf dh_catalog/*.*
-    rm -rf dh_catalog/*
-    cp -rf catalog/* dh_catalog
-    cd dh_catalog
-    find ./ -type f -name *.yaml -exec sed -i 's/tccr.io/dh.tccr.io/gI' {} \;
-    cd -
-   }
-export -f gen_dh_cat
-
 prep_helm() {
     if [[ -z "$standalone" ]]; then
     helm repo add truecharts-old https://truecharts.org
@@ -261,7 +227,23 @@ copy_apps() {
 }
 export -f copy_apps
 
-parthreads=$(($(nproc) * 2))
-parallel -j ${parthreads} chart_runner '2>&1' ::: ${1[@]}
-echo "Starting post-processing"
-gen_dh_cat
+if [[ -d "charts/${1}" ]]; then
+    echo "Start processing charts/${1} ..."
+    chartversion=$(cat charts/${1}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }')
+    chartname=$(basename charts/${1})
+    train=$(basename $(dirname "charts/${1}"))
+    SCALESUPPORT=$(cat charts/${1}/Chart.yaml | yq '.annotations."truecharts.org/SCALE-support"' -r)
+    helm dependency update "charts/${1}" --skip-refresh || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh)
+    if [[ "${SCALESUPPORT}" == "true" ]]; then
+      clean_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
+      copy_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
+      patch_apps "charts/${1}" "${chartname}" "$train" "${chartversion}"
+      include_questions "charts/${1}" "${chartname}" "$train" "${chartversion}"
+      clean_catalog "charts/${1}" "${chartname}" "$train" "${chartversion}"
+    else
+      echo "Skipping chart charts/${1}, no correct SCALE compatibility layer detected"
+    fi
+else
+    echo "Chart 'charts/${1}' no longer exists in repo. Skipping it..."
+fi
+echo "Done processing charts/${1} ..."
diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
index 812c4263c21..01bae5a102d 100644
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -160,7 +160,21 @@ jobs:
         run: |
           pip install yq
           CHARTS=(${{ steps.collect-changes.outputs.modifiedChartsAfterTag }})
-          .github/scripts/build-catalog.sh ${CHARTS[@]}
+          parthreads=$(($(nproc) * 2))
+          parallel -j ${parthreads} .github/scripts/build-catalog.sh '2>&1' ::: ${CHARTS[@]}
+
+
+      - name: Generate docker-hub Catalog
+        shell: bash
+        if: |
+          steps.collect-changes.outputs.changesDetectedAfterTag == 'true'
+        run: |
+          rm -rf dh_catalog/*.*
+          rm -rf dh_catalog/*
+          cp -rf catalog/* dh_catalog
+          cd dh_catalog
+          find ./ -type f -name *.yaml -exec sed -i 's/tccr.io/dh.tccr.io/gI' {} \;
+          cd -
 
       - name: Validate catalogs
         if: |
diff --git a/charts/dependency/mariadb/Chart.yaml b/charts/dependency/mariadb/Chart.yaml
index 630dca4474f..7094d6499dd 100644
--- a/charts/dependency/mariadb/Chart.yaml
+++ b/charts/dependency/mariadb/Chart.yaml
@@ -24,7 +24,7 @@ sources:
   - https://github.com/prometheus/mysqld_exporter
   - https://mariadb.org
 type: application
-version: 2.0.30
+version: 2.0.31
 annotations:
   truecharts.org/catagories: |
     - database
diff --git a/charts/dependency/memcached/Chart.yaml b/charts/dependency/memcached/Chart.yaml
index e4d7fe62c58..edee1df5547 100644
--- a/charts/dependency/memcached/Chart.yaml
+++ b/charts/dependency/memcached/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/bitnami/bitnami-docker-memcached
   - http://memcached.org/
 type: application
-version: 2.0.32
+version: 2.0.33
 annotations:
   truecharts.org/catagories: |
     - database