release: promote apisix v2.x helm chart to default branch (#738)

apache · Mar 20, 2024 · 6b8acad · 6b8acad
1 parent d25b615
commit 6b8acad
Show file tree

Hide file tree

Showing 34 changed files with 1,099 additions and 1,371 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,40 +9,15 @@ on:
 
 jobs:
 
-  helm_docs:
-    name: Check the Helm Docs format
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.19.2'
-
-      - name: Run helm-docs
-        run: |
-          GOBIN=$PWD GO111MODULE=on go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.0
-          ./helm-docs --chart-search-root=${GITHUB_WORKSPACE}/charts
-          DIFF=$(git diff ${GITHUB_WORKSPACE}/charts/**/*md)
-          if [ ! -z "$DIFF" ]; then
-            echo "Please use helm-docs in your clone, of your fork, of the project, and commit an updated README.md for the chart."
-          fi
-          git diff --exit-code
-          rm -f ./helm-docs
-
   helm:
     name: Helm chart
     runs-on: ubuntu-20.04
-    needs: helm_docs
     strategy:
       matrix:
         k8s: ["v1.16.15@sha256:64bac16b83b6adfd04ea3fbcf6c9b5b893277120f2b2cbf9f5fa3e5d4c2260cc", "v1.17.17@sha256:e477ee64df5731aa4ef4deabbafc34e8d9a686b49178f726563598344a3898d5", "v1.18.20@sha256:e3dca5e16116d11363e31639640042a9b1bd2c90f85717a7fc66be34089a8169", "v1.19.16@sha256:81f552397c1e6c1f293f967ecb1344d8857613fb978f963c30e907c32f598467", "v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb", "v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c", "v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166", "v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9"]
 
     steps:
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -94,3 +69,18 @@ jobs:
                && ct install \
                   --charts charts/apisix'
 
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.19.2'
+
+      - name: Run helm-docs
+        run: |
+          GOBIN=$PWD GO111MODULE=on go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.0
+          ./helm-docs --chart-search-root=${GITHUB_WORKSPACE}/charts
+          DIFF=$(git diff ${GITHUB_WORKSPACE}/charts/**/*md)
+          if [ ! -z "$DIFF" ]; then
+            echo "Please use helm-docs in your clone, of your fork, of the project, and commit a updated README.md for the chart."
+          fi
+          git diff --exit-code
+          rm -f ./helm-docs
diff --git a/README.md b/README.md
@@ -31,5 +31,10 @@ Currently, APISIX Ingress Controller automatically manipulates some APISIX resou
 
 |            | APISIX | APISIX Ingress | APISIX Dashboard |
 | :--------: | :----: | :------------: | :--------------: |
+| Chart v2.x |  v3.x  |      v1.x      |       v3.x       |
 | Chart v1.x |  v3.x  |      v1.x      |       v3.x       |
 | Chart v0.x |  v2.x  |      v1.x      |       v2.x       |
+
+## Changelogs
+
+We have made numerous broken changes to the APISIX Helm chart between v1.x and v2.x. If you wish to continue using or updating the v1.x, please utilize the `apisix/1.x` branch available in the repository.
diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: etcd
   repository: https://charts.bitnami.com/bitnami
-  version: 9.7.3
+  version: 8.7.7
 - name: apisix-dashboard
   repository: https://charts.apiseven.com
-  version: 0.8.2
+  version: 0.8.1
 - name: apisix-ingress-controller
   repository: https://charts.apiseven.com
-  version: 0.14.0
-digest: sha256:8d727979670a2b62af7672c36ebb2a4d294bc967b16fb5d1e144ed77c948062d
-generated: "2024-02-02T14:07:24.846532+08:00"
+  version: 0.13.0
+digest: sha256:6ca1fc0eb06fef4d4502a3153ed77c9cd5a382ebe65e676791afe4272ac7c796
+generated: "2023-12-14T20:21:52.603033345+02:00"
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
@@ -31,7 +31,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.11.0
+version: 2.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -42,16 +42,16 @@ sources:
 
 dependencies:
   - name: etcd
-    version: 9.7.3
+    version: 8.7.7
     repository: https://charts.bitnami.com/bitnami
     condition: etcd.enabled
   - name: apisix-dashboard
-    version: 0.8.2
+    version: 0.8.1
     repository: https://charts.apiseven.com
     condition: dashboard.enabled
     alias: dashboard
   - name: apisix-ingress-controller
-    version: 0.14.0
+    version: 0.13.0
     repository: https://charts.apiseven.com
     condition: ingress-controller.enabled
     alias: ingress-controller