From dd13ef89a05fe423128ad083070162690a5b7941 Mon Sep 17 00:00:00 2001
From: Nic <qianyong@api7.ai>
Date: Wed, 25 Mar 2026 17:04:47 +0800
Subject: [PATCH 1/3] fix: regenerate developer-portal-fe Chart.lock with valid
 digest

The Chart.lock had a placeholder digest hash that caused the
chart-releaser CI to fail with 'lock file out of sync' error.

Also add developer-portal-fe/charts to .gitignore to match other charts.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .gitignore                            | 1 +
 charts/developer-portal-fe/Chart.lock | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d959c3..9f40a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ charts/api7-dashboard/charts
 charts/devportal/charts
 images
 res
+charts/developer-portal-fe/charts
diff --git a/charts/developer-portal-fe/Chart.lock b/charts/developer-portal-fe/Chart.lock
index b39c2f5..de438fd 100644
--- a/charts/developer-portal-fe/Chart.lock
+++ b/charts/developer-portal-fe/Chart.lock
@@ -2,5 +2,5 @@ dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 12.12.10
-digest: sha256:c3d1e1b7e4e1f5f5e4a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0
-generated: "2024-03-23T09:28:00Z"
+digest: sha256:3b8c03cf5b8742b8110494d29a4793f20920294a504bd85940d02bb00d0bc0ea
+generated: "2026-03-25T17:04:07.589986044+08:00"

From 860071ca771d76a105c7fbafbf26d3c33c43d0f1 Mon Sep 17 00:00:00 2001
From: Nic <qianyong@api7.ai>
Date: Wed, 25 Mar 2026 17:21:57 +0800
Subject: [PATCH 2/3] fix: clean up .gitignore and add Chart.lock validation to
 CI

- Replace individual chart/*/charts entries with a single wildcard
  pattern, removing stale entries (api7-gateway, api7-dashboard, devportal)
- Add 'Verify Chart.lock files' CI step that runs helm dependency build
  on every chart with a Chart.lock, catching digest mismatches before merge

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 17 +++++++++++++++++
 .gitignore                |  5 +----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d8b6c71..4567100 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,6 +36,23 @@ jobs:
                   --charts charts/gateway \
                   --charts charts/ingress-controller'
 
+      - name: Verify Chart.lock files
+        run: |
+          for chart_dir in charts/*/; do
+            if [ -f "${chart_dir}Chart.lock" ]; then
+              echo "Verifying ${chart_dir}Chart.lock..."
+              docker run --rm --interactive --network host \
+                  --volume $PWD:/workdir \
+                  --workdir /workdir \
+                  quay.io/helmpack/chart-testing:v3.10.1 sh -c "
+                    helm repo add bitnami https://charts.bitnami.com/bitnami && \
+                    helm repo add apisix https://charts.apiseven.com && \
+                    helm repo add jaegertracing https://jaegertracing.github.io/helm-charts && \
+                    helm dependency build ${chart_dir}
+                  "
+            fi
+          done
+
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
         with:
diff --git a/.gitignore b/.gitignore
index 9f40a95..350feb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .DS_Store
 .idea
-charts/api7-gateway/charts
-charts/api7-dashboard/charts
-charts/devportal/charts
+charts/*/charts
 images
 res
-charts/developer-portal-fe/charts

From a32f7d76241f99c6fadf4cbe05c6b91c3b52baca Mon Sep 17 00:00:00 2001
From: Nic <qianyong@api7.ai>
Date: Wed, 25 Mar 2026 17:33:50 +0800
Subject: [PATCH 3/3] refactor: consolidate Chart.lock validation into single
 container

Move the for-loop inside the Docker container to avoid repeated container
startups and helm repo add calls. Also properly quote ${chart_dir}.

Suggested-by: CodeRabbit
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4567100..ffef827 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -38,20 +38,20 @@ jobs:
 
       - name: Verify Chart.lock files
         run: |
-          for chart_dir in charts/*/; do
-            if [ -f "${chart_dir}Chart.lock" ]; then
-              echo "Verifying ${chart_dir}Chart.lock..."
-              docker run --rm --interactive --network host \
-                  --volume $PWD:/workdir \
-                  --workdir /workdir \
-                  quay.io/helmpack/chart-testing:v3.10.1 sh -c "
-                    helm repo add bitnami https://charts.bitnami.com/bitnami && \
-                    helm repo add apisix https://charts.apiseven.com && \
-                    helm repo add jaegertracing https://jaegertracing.github.io/helm-charts && \
-                    helm dependency build ${chart_dir}
-                  "
-            fi
-          done
+          docker run --rm --interactive --network host \
+              --volume "$PWD:/workdir" \
+              --workdir /workdir \
+              quay.io/helmpack/chart-testing:v3.10.1 sh -c '
+                helm repo add bitnami https://charts.bitnami.com/bitnami && \
+                helm repo add apisix https://charts.apiseven.com && \
+                helm repo add jaegertracing https://jaegertracing.github.io/helm-charts && \
+                for chart_dir in charts/*/; do
+                  if [ -f "${chart_dir}Chart.lock" ]; then
+                    echo "Verifying ${chart_dir}Chart.lock..."
+                    helm dependency build "${chart_dir}"
+                  fi
+                done
+              '
 
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0