This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch feat/apisix-image-and-ui in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
commit 4875964460edaf6578209714f8aa69ab7be48a85 Author: juzhiyuan <juzhiy...@apache.org> AuthorDate: Fri Jul 25 15:26:43 2025 +0800 chore: remove dashboard and updated docker image --- charts/apisix/Chart.lock | 7 ++----- charts/apisix/Chart.yaml | 15 +++++++++------ charts/apisix/README.md | 9 ++++----- charts/apisix/charts/apisix-dashboard-0.8.2.tgz | Bin 8013 -> 0 bytes charts/apisix/templates/configmap.yaml | 5 ++++- charts/apisix/values.yaml | 18 ++---------------- 6 files changed, 21 insertions(+), 33 deletions(-) diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock index 7fef2f8..93afbb6 100644 --- a/charts/apisix/Chart.lock +++ b/charts/apisix/Chart.lock @@ -2,11 +2,8 @@ dependencies: - name: etcd repository: https://charts.bitnami.com/bitnami version: 9.7.3 -- name: apisix-dashboard - repository: https://charts.apiseven.com - version: 0.8.2 - name: apisix-ingress-controller repository: https://charts.apiseven.com version: 1.0.2 -digest: sha256:79f85a646cbd3c7b9a85898cf27463e0850b6cfdffd6df489ffa3c0fe1cb83ff -generated: "2025-07-11T10:11:32.7016667+08:00" +digest: sha256:61e2b59f316fcc2f29f4dc8c69ed3f1c4e0802ead88e1522585e0cf449965f34 +generated: "2025-07-25T15:00:34.85056+08:00" diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml index 78f1c2d..ca38586 100644 --- 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: 2.11.2 +version: 2.11.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 @@ -45,11 +45,6 @@ dependencies: version: 9.7.3 repository: https://charts.bitnami.com/bitnami condition: etcd.enabled - - name: apisix-dashboard - version: 0.8.2 - repository: https://charts.apiseven.com - condition: dashboard.enabled - alias: dashboard - name: apisix-ingress-controller version: 1.0.2 repository: https://charts.apiseven.com @@ -58,6 +53,14 @@ dependencies: maintainers: - name: tao12345666333 + - name: AlinsRan + email: alins...@apache.org + - name: nic-6443 + email: nic...@apache.org + - name: bzp2010 + email: bzp2...@apache.org + - name: juzhiyuan + email: juzhiy...@api7.ai # ref: https://artifacthub.io/docs/topics/annotations/helm/ annotations: diff --git a/charts/apisix/README.md b/charts/apisix/README.md index b015bc3..b9cc381 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -21,6 +21,9 @@ To install the chart with the release name `my-apisix`: helm repo add apisix https://charts.apiseven.com helm repo update +# Optional: List the APISIX chart version and the app version. +helm search repo apisix + helm install [RELEASE_NAME] apisix/apisix --namespace ingress-apisix --create-namespace ``` @@ -50,6 +53,7 @@ The command removes all the Kubernetes components associated with the chart and | apisix.admin.credentials.secretViewerKey | string | `""` | Name of the viewer role key in the secret, overrides the default key name "viewer" | | apisix.admin.credentials.viewer | string | `"4054f7cf07e344346cd3f287985e76a2"` | Apache APISIX admin API viewer role credentials | | apisix.admin.enabled | bool | `true` | Enable Admin API | +| apisix.admin.enable_admin_ui | bool | `true` | Enable Embedded Admin UI | | apisix.admin.externalIPs | list | `[]` | IPs for which nodes in the cluster will also accept traffic for the servic | | apisix.admin.ingress | object | `{"annotations":{},"enabled":false,"hosts":[{"host":"apisix-admin.local","paths":["/apisix"]}],"tls":[]}` | Using ingress access Apache APISIX admin service | | apisix.admin.ingress.annotations | object | `{}` | Ingress annotations | @@ -149,11 +153,6 @@ 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 | -| dashboard.config.conf.etcd.endpoints | list | `["apisix-etcd:2379"]` | Supports defining multiple etcd host addresses for an etcd cluster | -| dashboard.config.conf.etcd.password | string | `nil` | Specifies etcd basic auth password if enable etcd auth | -| dashboard.config.conf.etcd.prefix | string | `"/apisix"` | apisix configurations prefix | -| dashboard.config.conf.etcd.username | string | `nil` | Specifies etcd basic auth username if enable etcd auth | -| dashboard.enabled | bool | `false` | | | 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.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 | diff --git a/charts/apisix/charts/apisix-dashboard-0.8.2.tgz b/charts/apisix/charts/apisix-dashboard-0.8.2.tgz deleted file mode 100644 index 3a9992e..0000000 Binary files a/charts/apisix/charts/apisix-dashboard-0.8.2.tgz and /dev/null differ diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml index e57df0b..53c9894 100644 --- a/charts/apisix/templates/configmap.yaml +++ b/charts/apisix/templates/configmap.yaml @@ -320,6 +320,9 @@ data: {{- if not (eq .Values.apisix.deployment.role "data_plane") }} admin: + {{- if .Values.etcd.enabled }} + enable_admin_ui: {{ .Values.apisix.admin.enable_admin_ui }} + {{- end }} allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow {{- if .Values.apisix.admin.allow.ipList }} {{- range $ips := .Values.apisix.admin.allow.ipList }} @@ -328,7 +331,7 @@ data: {{- else }} - 0.0.0.0/0 {{- end}} - {{- if or (index .Values "ingress-controller" "enabled") .Values.dashboard.enabled }} + {{- if (index .Values "ingress-controller" "enabled") }} - 0.0.0.0/0 {{- end}} # - "::/64" diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index ccbb68f..bf6c76d 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -29,7 +29,7 @@ image: pullPolicy: IfNotPresent # -- Apache APISIX image tag # Overrides the image tag whose default is the chart appVersion. - tag: 3.13.0-debian + tag: 3.13.0-ubuntu # -- set false to use `Deployment`, set true to use `DaemonSet` useDaemonSet: false @@ -356,6 +356,7 @@ apisix: admin: # -- Enable Admin API enabled: true + enable_admin_ui: true # -- admin service type type: ClusterIP # loadBalancerIP: a.b.c.d @@ -640,21 +641,6 @@ etcd: autoCompactionRetention: "1h" autoCompactionMode: "periodic" -dashboard: - enabled: false - config: - conf: - etcd: - # -- Supports defining multiple etcd host addresses for an etcd cluster - endpoints: - - apisix-etcd:2379 - # -- apisix configurations prefix - prefix: "/apisix" - # -- Specifies etcd basic auth username if enable etcd auth - username: ~ - # -- Specifies etcd basic auth password if enable etcd auth - password: ~ - # -- Ingress controller configuration ingress-controller: enabled: false