Merge branch 'apache:master' into ft/proxy-cache-zones

Author: brmejia

.github/workflows/ci.yaml

@@ -29,11 +29,12 @@ jobs:
               --name ct-lint \
               --volume $PWD:/workdir \
               --workdir /workdir/charts/apisix \
-              quay.io/helmpack/chart-testing:v3.4.0 sh -c 'helm dependency update \
+              quay.io/helmpack/chart-testing:v3.13.0 sh -c 'helm dependency update \
                && cd ../.. \
                && helm repo add bitnami https://charts.bitnami.com/bitnami \
-               && helm repo add apisix https://charts.apiseven.com \
+               && helm repo add apisix https://apache.github.io/apisix-helm-chart \
                && ct lint \
+                  --validate-maintainers=false \
                   --charts charts/apisix \
                   --charts charts/apisix-dashboard \
                   --charts charts/apisix-ingress-controller'
@@ -62,10 +63,10 @@ jobs:
               --volume $HOME/.kube/kind-config-kind:/root/.kube/config \
               --volume $PWD:/workdir \
               --workdir /workdir/charts/apisix \
-              quay.io/helmpack/chart-testing:v3.4.0 sh -c 'helm dependency update \
+              quay.io/helmpack/chart-testing:v3.13.0 sh -c 'helm dependency update \
                && cd ../.. \
                && helm repo add bitnami https://charts.bitnami.com/bitnami \
-               && helm repo add apisix https://charts.apiseven.com \
+               && helm repo add apisix https://apache.github.io/apisix-helm-chart \
                && ct install \
                   --charts charts/apisix'
 

.github/workflows/release.yaml

@@ -30,12 +30,14 @@ jobs:
       - name: Add Helm repo
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm repo add apisix https://charts.apiseven.com
+          helm repo add apisix https://apache.github.io/apisix-helm-chart
 
       - name: Run chart-releaser
         uses: ./.github/actions/chart-releaser-action
         with:
           charts_dir: .
+          version: v1.8.1
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: true
+          HELM_EXPERIMENTAL_OCI: 1

README.md

@@ -22,18 +22,18 @@
 Apache APISIX Helm Charts provide the installation of [Apache APISIX](https://github.com/apache/apisix#apache-apisix) components for kubernetes.
 
 - [Apache APISIX Helm Chart](./docs/en/latest/apisix.md)
-- [Apache APISIX Dashboard Helm Chart](./docs/en/latest/apisix-dashboard.md)
+- [[DEPRECATED] Apache APISIX Dashboard Helm Chart](./docs/en/latest/apisix-dashboard.md)
 - [Apache APISIX Ingress Controller Helm Chart](./docs/en/latest/apisix-ingress-controller.md)
 
 Currently, APISIX Ingress Controller automatically manipulates some APISIX resources, which is not very compatible with APISIX Dashboard. In addition, users should not modify resources labeled `managed-by: apisix-ingress-controllers` via APISIX Dashboard.
 
 ## Compatibility matrix
 
-|            | 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       |
+|            | APISIX | APISIX Ingress | [DEPRECATED] APISIX Dashboard |
+|:----------:|:------:|:--------------:|:-----------------------------:|
+| Chart v2.x |  v3.x  |   v1.x v2.x    |             v3.x              |
+| Chart v1.x |  v3.x  |      v1.x      |             v3.x              |
+| Chart v0.x |  v2.x  |      v1.x      |             v2.x              |
 
 ## Changelogs
 

charts/apisix-dashboard/Chart.yaml

@@ -14,9 +14,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+# This chart is deprecated and no longer maintained.
+#
+# In short:
+# The old version of the APISIX Dashboard lacks maintenance from community members,
+# while the brand new Dashboard will be directly integrated into APISIX,
+# eliminating the need for the current chart.
+#
+# For details, please see https://github.com/apache/apisix-dashboard/issues/2981.
+#
+# If you are still using the old version of the APISIX Dashboard,
+# you can continue to use the chart.
+deprecated: true
+
 apiVersion: v2
 name: apisix-dashboard
-description: A Helm chart for Apache APISIX Dashboard
+description: DEPRECATED A Helm chart for Apache APISIX Dashboard
 icon: https://apache.org/logos/res/apisix/apisix.png
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -31,12 +45,9 @@ 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: 0.8.2
+version: 0.8.3
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 appVersion: 3.0.0
-
-maintainers:
-  - name: tao12345666333

charts/apisix-dashboard/README.md

@@ -1,4 +1,17 @@
-# Apache APISIX Dashboard
+# [DEPRECATED] Apache APISIX Dashboard
+
+> [!WARNING]
+> This chart is deprecated and no longer maintained.
+>
+> In short:
+> The old version of the APISIX Dashboard lacks maintenance from community members,
+> while the brand new Dashboard will be directly integrated into APISIX,
+> eliminating the need for the current chart.
+>
+> For details, please see <https://github.com/apache/apisix-dashboard/issues/2981>.
+>
+> If you are still using the old version of the APISIX Dashboard,
+> you can continue to use the chart.
 
 [APISIX Dashboard](https://github.com/apache/apisix-dashboard/) is designed to make it as easy as possible for users to operate Apache APISIX through a frontend interface.
 
@@ -11,7 +24,7 @@ APISIX Dashboard requires Kubernetes version 1.14+.
 ## Get Repo Info
 
 ```console
-helm repo add apisix https://charts.apiseven.com
+helm repo add apisix https://apache.github.io/apisix-helm-chart
 helm repo update
 ```
 

charts/apisix-dashboard/README.md.gotmpl

@@ -1,4 +1,17 @@
-# Apache APISIX Dashboard
+# [DEPRECATED] Apache APISIX Dashboard
+
+> [!WARNING]
+> This chart is deprecated and no longer maintained.
+>
+> In short:
+> The old version of the APISIX Dashboard lacks maintenance from community members,
+> while the brand new Dashboard will be directly integrated into APISIX,
+> eliminating the need for the current chart.
+>
+> For details, please see <https://github.com/apache/apisix-dashboard/issues/2981>.
+>
+> If you are still using the old version of the APISIX Dashboard,
+> you can continue to use the chart.
 
 [APISIX Dashboard](https://github.com/apache/apisix-dashboard/) is designed to make it as easy as possible for users to operate Apache APISIX through a frontend interface.
 
@@ -11,7 +24,7 @@ APISIX Dashboard requires Kubernetes version 1.14+.
 ## Get Repo Info
 
 ```console
-helm repo add apisix https://charts.apiseven.com
+helm repo add apisix https://apache.github.io/apisix-helm-chart
 helm repo update
 ```
 

charts/apisix-ingress-controller/Chart.yaml

@@ -24,8 +24,8 @@ keywords:
   - nginx
   - crd
 type: application
-version: 0.14.0
-appVersion: 1.8.0
+version: 1.1.0
+appVersion: 2.0.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
@@ -34,4 +34,4 @@ maintainers:
 
 # ref: https://artifacthub.io/docs/topics/annotations/helm/
 annotations:
-  artifacthub.io/prerelease: "false"
+  artifacthub.io/prerelease: "true"