From 3c0fe263deb0ea7f34ed8c26b44303d2a6e05979 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 5 Jul 2024 11:15:17 +0530
Subject: [PATCH] Helm charts: Fixed dependency builds

Signed-off-by: Lalith Kota <kotalalith@gmail.com>
---
 .github/workflows/push_trigger.yml                 | 4 +++-
 charts/reporting/.gitignore                        | 2 +-
 charts/reporting/Chart.yaml                        | 2 --
 charts/reporting/charts/debezium                   | 1 +
 charts/reporting/charts/opensearch-kafka-connector | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)
 create mode 120000 charts/reporting/charts/debezium
 create mode 120000 charts/reporting/charts/opensearch-kafka-connector

diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
index ea49603..248b427 100644
--- a/.github/workflows/push_trigger.yml
+++ b/.github/workflows/push_trigger.yml
@@ -46,12 +46,14 @@ jobs:
           echo "::warning::No Charts to publish";
           echo "SKIP=TRUE" >> $GITHUB_ENV
         else
+          for chartpath in charts/*/; do
+            helm dep up $chartpath
+          done
           RANCHER_CHARTS=()
           while IFS= read -r chartpath; do
             echo "chartpath: $chartpath"
             chartname=$(basename "$chartpath")
             echo "Chartname: $chartname"
-            helm dep up charts/$chartpath
             helm package charts/$chartpath
             is_rancher_chart=$(grep "$RANCHER_CHART_FILTER" charts/${chartpath%*/}/Chart.yaml || true)
             if [ -n "$is_rancher_chart" ]; then
diff --git a/charts/reporting/.gitignore b/charts/reporting/.gitignore
index f791801..9169e44 100644
--- a/charts/reporting/.gitignore
+++ b/charts/reporting/.gitignore
@@ -1,2 +1,2 @@
-charts/
+charts/*.tgz
 Chart.lock
diff --git a/charts/reporting/Chart.yaml b/charts/reporting/Chart.yaml
index 6dbb462..7471df6 100644
--- a/charts/reporting/Chart.yaml
+++ b/charts/reporting/Chart.yaml
@@ -13,11 +13,9 @@ dependencies:
   repository: oci://registry-1.docker.io/bitnamicharts
   condition: opensearch.enabled
 - name: debezium
-  repository: https://openg2p.github.io/openg2p-helm
   version: 2.6.0
   condition: debezium.enabled
 - name: opensearch-kafka-connector
-  repository: https://openg2p.github.io/openg2p-helm
   version: 0.0.0-develop
   condition: opensearch-kafka-connector.enabled
 icon: https://openg2p.github.io/openg2p-helm/openg2p-logo.png
diff --git a/charts/reporting/charts/debezium b/charts/reporting/charts/debezium
new file mode 120000
index 0000000..e1f2bf5
--- /dev/null
+++ b/charts/reporting/charts/debezium
@@ -0,0 +1 @@
+../../debezium
\ No newline at end of file
diff --git a/charts/reporting/charts/opensearch-kafka-connector b/charts/reporting/charts/opensearch-kafka-connector
new file mode 120000
index 0000000..2e6f8dd
--- /dev/null
+++ b/charts/reporting/charts/opensearch-kafka-connector
@@ -0,0 +1 @@
+../../opensearch-kafka-connector
\ No newline at end of file