feat: add apisix-dashboard to apisix chart (#471)

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       |

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"

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

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 |

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"

charts/apisix/values.yaml

@@ -596,6 +596,9 @@ etcd:
 
   replicaCount: 3
 
+dashboard:
+  enabled: false
+
 # -- Ingress controller configuration
 ingress-controller:
   enabled: false