From 9ce994969d720c2c0f31633dac2f4463dacdb5cd Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 22 Jan 2025 11:25:45 +0100 Subject: [PATCH 1/4] [bitnami/apisix] Update ETCD to major 11 Signed-off-by: David Gomez --- bitnami/apisix/Chart.lock | 6 +++--- bitnami/apisix/Chart.yaml | 4 ++-- bitnami/apisix/README.md | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bitnami/apisix/Chart.lock b/bitnami/apisix/Chart.lock index d22bb4f4539a53..4bdfb3d45df611 100644 --- a/bitnami/apisix/Chart.lock +++ b/bitnami/apisix/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: etcd repository: oci://registry-1.docker.io/bitnamicharts - version: 10.7.1 + version: 11.0.1 - name: common repository: oci://registry-1.docker.io/bitnamicharts version: 2.29.0 -digest: sha256:6fc5fa97897717b27e985da35f8235f195e4f9d143c066914d5846803cc7ad27 -generated: "2025-01-09T11:02:59.202874125Z" +digest: sha256:b209124fc614df1ddc91d60a0881c5ffe03ef1a6f264a51479d224d79e3d751c +generated: "2025-01-22T11:24:08.352507+01:00" diff --git a/bitnami/apisix/Chart.yaml b/bitnami/apisix/Chart.yaml index aaf38d54d366c0..71e08a956d7bb1 100644 --- a/bitnami/apisix/Chart.yaml +++ b/bitnami/apisix/Chart.yaml @@ -19,7 +19,7 @@ dependencies: - name: etcd repository: oci://registry-1.docker.io/bitnamicharts condition: etcd.enabled - version: 10.x.x + version: 11.x.x - name: common repository: oci://registry-1.docker.io/bitnamicharts tags: @@ -45,4 +45,4 @@ sources: - https://github.com/bitnami/charts/tree/main/bitnami/apisix - https://github.com/bitnami/charts/tree/main/bitnami/apisix-dashboard - https://github.com/bitnami/charts/tree/main/bitnami/apisix-ingress-controller -version: 3.7.2 +version: 4.0.0 diff --git a/bitnami/apisix/README.md b/bitnami/apisix/README.md index 9cb0b8594e64d9..6b102cd309d1e7 100644 --- a/bitnami/apisix/README.md +++ b/bitnami/apisix/README.md @@ -1097,6 +1097,10 @@ Find more information about how to deal with common errors related to Bitnami's ## Upgrading +### To 4.0.0 + +This major updates the `etcd` subchart to it newest major,1.0.0. For more information on this subchart's major, please refer to [etcd upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/etcd#to-1100). + ### To 3.7.0 This version introduces image verification for security purposes. To disable it, set `global.security.allowInsecureImages` to `true`. More details at [GitHub issue](https://github.com/bitnami/charts/issues/30850). From 01eecaeb6e745e82dfd6421c6bb3dc5401e72311 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 22 Jan 2025 11:34:30 +0100 Subject: [PATCH 2/4] [bitnami/apisix] Fix typo in README.md Signed-off-by: David Gomez --- bitnami/apisix/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/apisix/README.md b/bitnami/apisix/README.md index 6b102cd309d1e7..766f9f5fabe76d 100644 --- a/bitnami/apisix/README.md +++ b/bitnami/apisix/README.md @@ -1099,7 +1099,7 @@ Find more information about how to deal with common errors related to Bitnami's ### To 4.0.0 -This major updates the `etcd` subchart to it newest major,1.0.0. For more information on this subchart's major, please refer to [etcd upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/etcd#to-1100). +This major updates the `etcd` subchart to it newest major, 11.0.0. For more information on this subchart's major, please refer to [etcd upgrade notes](https://github.com/bitnami/charts/tree/main/bitnami/etcd#to-1100). ### To 3.7.0 From 8196fec0c786e314491121978152f0edd038171d Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 22 Jan 2025 11:00:28 +0000 Subject: [PATCH 3/4] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/apisix/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/apisix/CHANGELOG.md b/bitnami/apisix/CHANGELOG.md index 3f7ef08766b44f..0550612b193a9e 100644 --- a/bitnami/apisix/CHANGELOG.md +++ b/bitnami/apisix/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 3.7.2 (2025-01-17) +## 4.0.0 (2025-01-22) -* [bitnami/apisix] feat: :recycle: Use os-shell for config generation ([#31455](https://github.com/bitnami/charts/pull/31455)) +* [bitnami/apisix] Update ETCD to major 11 ([#31508](https://github.com/bitnami/charts/pull/31508)) + +## 3.7.2 (2025-01-17) + +* [bitnami/apisix] feat: :recycle: Use os-shell for config generation (#31455) ([e808ba0](https://github.com/bitnami/charts/commit/e808ba010c008023c7dfc1c1ee5bafb2f9acf38c)), closes [#31455](https://github.com/bitnami/charts/issues/31455) ## 3.7.1 (2025-01-09) From d83208d13106470865aba08b3f8f5d63a08d433d Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 22 Jan 2025 12:41:05 +0100 Subject: [PATCH 4/4] [bitnami/apisix] Remove duplicated line in GOSS file Signed-off-by: David Gomez --- .vib/apisix/goss/goss.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vib/apisix/goss/goss.yaml b/.vib/apisix/goss/goss.yaml index a1823a25223a87..c45729fcae44da 100644 --- a/.vib/apisix/goss/goss.yaml +++ b/.vib/apisix/goss/goss.yaml @@ -18,9 +18,6 @@ http: status: 404 http://127.0.0.1:{{ .Vars.dataPlane.containerPorts.control }}/v1/healthcheck: status: 200 - https://apisix-control-plane:{{ .Vars.controlPlane.service.ports.adminAPI }}/apisix/admin/routes: - status: 401 - allow-insecure: true https://apisix-control-plane:{{ .Vars.controlPlane.service.ports.adminAPI }}/apisix/admin/routes: status: 200 request-headers: