This is an automated email from the ASF dual-hosted git repository. nic443 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push: new e4552ff chore: upgrade etcd chart to latest version and use latest image (#868) e4552ff is described below commit e4552ffef20c8bab14c64b4462fbb88547a71b3e Author: Nic <qiany...@api7.ai> AuthorDate: Tue Sep 2 13:53:08 2025 +0800 chore: upgrade etcd chart to latest version and use latest image (#868) Signed-off-by: Nic <qiany...@api7.ai> --- .github/workflows/ci.yaml | 5 +++-- charts/apisix/Chart.lock | 6 +++--- charts/apisix/Chart.yaml | 2 +- charts/apisix/README.md | 6 ++++-- charts/apisix/charts/etcd-12.0.18.tgz | Bin 0 -> 64955 bytes charts/apisix/charts/etcd-9.7.3.tgz | Bin 44977 -> 0 bytes charts/apisix/values.yaml | 12 +++++++++++- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 420e3d5..72a92f9 100644 --- a/.github/workflows/ci.yaml +++ b/.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 \ && ct lint \ + --validate-maintainers=false \ --charts charts/apisix \ --charts charts/apisix-dashboard \ --charts charts/apisix-ingress-controller' @@ -62,7 +63,7 @@ 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 \ diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock index dce9a7b..de6619c 100644 --- a/charts/apisix/Chart.lock +++ b/charts/apisix/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: etcd repository: https://charts.bitnami.com/bitnami - version: 9.7.3 + version: 12.0.18 - name: apisix-ingress-controller repository: https://charts.apiseven.com version: 1.0.5 -digest: sha256:cf722d2d1c67d1097a7eb9dabe0fca76077dc15debaf8ab12b155b508c1c3e35 -generated: "2025-09-01T10:34:11.239287+08:00" +digest: sha256:645325383aa153ba7b41ef4f63ba38f5169173b2791aaeb32b0754ecbb922884 +generated: "2025-09-01T16:08:09.544116895+08:00" diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml index c3a0117..b8deb46 100644 --- a/charts/apisix/Chart.yaml +++ b/charts/apisix/Chart.yaml @@ -42,7 +42,7 @@ sources: dependencies: - name: etcd - version: 9.7.3 + version: 12.0.18 repository: https://charts.bitnami.com/bitnami condition: etcd.enabled - name: apisix-ingress-controller diff --git a/charts/apisix/README.md b/charts/apisix/README.md index dc35388..a43a21a 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -151,7 +151,7 @@ The command removes all the Kubernetes components associated with the chart and | control.service.port | int | `9090` | which port to use for Apache APISIX Control API | | control.service.servicePort | int | `9090` | Service port to use for Apache APISIX Control API | | control.service.type | string | `"ClusterIP"` | Control service type | -| etcd | object | `{"auth":{"rbac":{"create":false,"rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}},"autoCompactionMode":"periodic","autoCompactionRetention":"1h","containerSecurityContext":{"enabled":false},"enabled":true,"prefix":"/apisix","replicaCount":3,"service":{"port":2379},"timeout":30}` | etcd configuration use the FQDN address or the IP of the etcd | +| etcd | object | `{"auth":{"rbac":{"create":false,"rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}},"autoCompactionMode":"periodic","autoCompactionRetention":"1h","containerSecurityContext":{"enabled":false},"enabled":true,"image":{"registry":"docker.io","repository":"bitnami/etcd","tag":"latest"},"prefix":"/apisix","replicaCount":3,"service":{"port":2379},"timeout":30}` | etcd configuration use the FQDN address [...] | etcd.auth | object | `{"rbac":{"create":false,"rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}}` | if etcd.enabled is true, set more values of bitnami/etcd helm chart | | etcd.auth.rbac.create | bool | `false` | No authentication by default. Switch to enable RBAC authentication | | etcd.auth.rbac.rootPassword | string | `""` | root password for etcd. Requires etcd.auth.rbac.create to be true. | @@ -162,7 +162,9 @@ The command removes all the Kubernetes components associated with the chart and | etcd.auth.tls.sni | string | `""` | specify the TLS Server Name Indication extension, the ETCD endpoint hostname will be used when this setting is unset. | | etcd.auth.tls.verify | bool | `true` | whether to verify the etcd endpoint certificate when setup a TLS connection to etcd | | etcd.containerSecurityContext | object | `{"enabled":false}` | added for backward compatibility with old kubernetes versions, as seccompProfile is not supported in kubernetes < 1.19 | -| etcd.enabled | bool | `true` | install etcd(v3) by default, set false if do not want to install etcd(v3) together | +| etcd.enabled | bool | `true` | install built-in etcd by default, set false if do not want to install built-in etcd together, this etcd is based on bitnami/etcd helm chart and latest bitnami docker image, only for development and testing purposes, if you want to use etcd in production, we recommend you to install etcd by yourself and use `externalEtcd` to connect it. | +| etcd.image | object | `{"registry":"docker.io","repository":"bitnami/etcd","tag":"latest"}` | docker image for built-in etcd | +| etcd.image.tag | string | `"latest"` | `bitnami/etcd` only provide `latest` tag now, ref: https://github.com/bitnami/containers/issues/83267, you can switch `etcd.image.repository` to `bitnamilegacy/etcd` to use old versioned tags. | | etcd.prefix | string | `"/apisix"` | apisix configurations prefix | | etcd.timeout | int | `30` | Set the timeout value in seconds for subsequent socket operations from apisix to etcd cluster | | externalEtcd | object | `{"existingSecret":"","host":["http://etcd.host:2379"],"password":"","secretPasswordKey":"etcd-root-password","user":"root"}` | external etcd configuration. If etcd.enabled is false, these configuration will be used. | diff --git a/charts/apisix/charts/etcd-12.0.18.tgz b/charts/apisix/charts/etcd-12.0.18.tgz new file mode 100644 index 0000000..600835e Binary files /dev/null and b/charts/apisix/charts/etcd-12.0.18.tgz differ diff --git a/charts/apisix/charts/etcd-9.7.3.tgz b/charts/apisix/charts/etcd-9.7.3.tgz deleted file mode 100644 index dd19be3..0000000 Binary files a/charts/apisix/charts/etcd-9.7.3.tgz and /dev/null differ diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index 406cb39..de5ad50 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -604,8 +604,18 @@ externalEtcd: # -- etcd configuration # use the FQDN address or the IP of the etcd etcd: - # -- install etcd(v3) by default, set false if do not want to install etcd(v3) together + # -- install built-in etcd by default, set false if do not want to install built-in etcd together, + # this etcd is based on bitnami/etcd helm chart and latest bitnami docker image, only for development and testing purposes, + # if you want to use etcd in production, we recommend you to install etcd by yourself and use `externalEtcd` to connect it. enabled: true + # -- docker image for built-in etcd + image: + registry: docker.io + repository: bitnami/etcd + # -- `bitnami/etcd` only provide `latest` tag now, ref: https://github.com/bitnami/containers/issues/83267, + # you can switch `etcd.image.repository` to `bitnamilegacy/etcd` to use old versioned tags. + tag: latest + # -- apisix configurations prefix prefix: "/apisix" # -- Set the timeout value in seconds for subsequent socket operations from apisix to etcd cluster