This is an automated email from the ASF dual-hosted git repository.
tokers 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 b552904 feat: add apisix-dashboard to apisix chart (#471)
b552904 is described below
commit b552904cddb5d788bdf4135a055ad91f8af929c5
Author: litesun <[email protected]>
AuthorDate: Fri Feb 17 17:43:20 2023 +0800
feat: add apisix-dashboard to apisix chart (#471)
---
README.md | 2 +-
charts/apisix/Chart.lock | 7 +++++--
charts/apisix/Chart.yaml | 9 +++++++--
charts/apisix/README.md | 1 +
charts/apisix/charts/apisix-dashboard-0.8.0.tgz | Bin 0 -> 7044 bytes
charts/apisix/templates/configmap.yaml | 2 +-
charts/apisix/values.yaml | 3 +++
7 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 6442de4..9049631 100644
--- a/README.md
+++ b/README.md
@@ -31,5 +31,5 @@ Currently, APISIX Ingress Controller automatically
manipulates some APISIX resou
| | APISIX | APISIX Ingress | APISIX Dashboard |
| :--------: | :----: | :------------: | :--------------: |
-| Chart v1.x | v3.x | v1.x | - |
+| Chart v1.x | v3.x | v1.x | v3.x |
| Chart v0.x | v2.x | v1.x | v2.x |
diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock
index fede7ac..2f1c607 100644
--- a/charts/apisix/Chart.lock
+++ b/charts/apisix/Chart.lock
@@ -2,8 +2,11 @@ dependencies:
- name: etcd
repository: https://charts.bitnami.com/bitnami
version: 8.3.4
+- name: apisix-dashboard
+ repository: https://charts.apiseven.com
+ version: 0.8.0
- name: apisix-ingress-controller
repository: https://charts.apiseven.com
version: 0.11.3
-digest: sha256:ddc42ebc9def715f7555a1302cb088e765b2fc62803efbb603e8270b54e414c4
-generated: "2023-01-09T16:40:24.127724463+08:00"
+digest: sha256:7b70ad741c7bbad8c75f6a304732432119852a2afc2e9b06630ba15819fdc0fc
+generated: "2023-02-16T12:01:51.939303+08:00"
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index e6183c2..e2300c5 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ 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.1.0
+version: 1.1.1
# 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.1.0
+appVersion: 3.1.1
sources:
- https://github.com/apache/apisix-helm-chart
@@ -45,6 +45,11 @@ dependencies:
version: 8.3.4
repository: https://charts.bitnami.com/bitnami
condition: etcd.enabled
+ - name: apisix-dashboard
+ version: 0.8.0
+ repository: https://charts.apiseven.com
+ condition: dashboard.enabled
+ alias: dashboard
- name: apisix-ingress-controller
version: 0.11.3
repository: https://charts.apiseven.com
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index a12df56..8bd6d26 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -101,6 +101,7 @@ The command removes all the Kubernetes components
associated with the chart and
| customPlugins.plugins[0].configMap | object |
`{"mounts":[{"key":"","path":""},{"key":"","path":""}],"name":""}` | plugin
codes can be saved inside configmap object. |
| customPlugins.plugins[0].configMap.mounts | list |
`[{"key":"","path":""},{"key":"","path":""}]` | since keys in configmap is
flat, mountPath allows to define the mount path, so that plugin codes can be
mounted hierarchically. |
| customPlugins.plugins[0].configMap.name | string | `""` | name of configmap.
|
+| dashboard.enabled | bool | `false` | |
| deployment.certs | object |
`{"cert":"","cert_key":"","certsSecret":"","mTLSCACert":"","mTLSCACertSecret":""}`
| certs used for certificates in decoupled mode |
| deployment.certs.cert | string | `""` | cert name in certsSecret |
| deployment.certs.cert_key | string | `""` | cert key in certsSecret |
diff --git a/charts/apisix/charts/apisix-dashboard-0.8.0.tgz
b/charts/apisix/charts/apisix-dashboard-0.8.0.tgz
new file mode 100644
index 0000000..14281c7
Binary files /dev/null and b/charts/apisix/charts/apisix-dashboard-0.8.0.tgz
differ
diff --git a/charts/apisix/templates/configmap.yaml
b/charts/apisix/templates/configmap.yaml
index b6078a2..7f89550 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -281,7 +281,7 @@ data:
{{- else }}
- 0.0.0.0/0
{{- end}}
- {{- if (index .Values "ingress-controller" "enabled") }}
+ {{- if or (index .Values "ingress-controller" "enabled")
.Values.dashboard.enabled }}
- 0.0.0.0/0
{{- end}}
# - "::/64"
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index af6155a..f0c05a3 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -596,6 +596,9 @@ etcd:
replicaCount: 3
+dashboard:
+ enabled: false
+
# -- Ingress controller configuration
ingress-controller:
enabled: false
