[bitnami/apisix] Fixes to support running Apisix in standalone mode (#…

…27062) * Fixes to support running Apisix in standalone mode Signed-off-by: James Riley McHugh <mchugh_james@bah.com> * Bumbed fix version in apisix Chart.yaml Signed-off-by: James Riley McHugh <mchugh_james@bah.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Bumbed chart version Signed-off-by: James Riley McHugh <mchugh_james@bah.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> * Bumbed chart version Signed-off-by: James Riley McHugh <mchugh_james@bah.com> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> --------- Signed-off-by: James Riley McHugh <mchugh_james@bah.com> Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com> Co-authored-by: James Riley McHugh <mchugh_james@bah.com> Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
bitnami · Jun 20, 2024 · 272a58e · 272a58e
1 parent db8ef30
commit 272a58e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/bitnami/apisix/CHANGELOG.md b/bitnami/apisix/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 3.2.4 (2024-06-18)
+## 3.2.5 (2024-06-18)
 
-* [bitnami/apisix] Release 3.2.4 ([#27329](https://github.com/bitnami/charts/pull/27329))
+* [bitnami/apisix] Fixes to support running Apisix in standalone mode ([#27062](https://github.com/bitnami/charts/pull/27062))
+
+## <small>3.2.4 (2024-06-18)</small>
+
+* [bitnami/apisix] Release 3.2.4 (#27329) ([991b820](https://github.com/bitnami/charts/commit/991b820e187ea80c4b16146128af9c4d06df03ee)), closes [#27329](https://github.com/bitnami/charts/issues/27329)
 
 ## <small>3.2.3 (2024-06-17)</small>
 

diff --git a/bitnami/apisix/Chart.yaml b/bitnami/apisix/Chart.yaml
@@ -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.2.4
+version: 3.2.5
diff --git a/bitnami/apisix/README.md b/bitnami/apisix/README.md
@@ -91,6 +91,8 @@ ingressController:
   enabled: false
 etcd:
   enabled: false
+dashboard:
+  enabled: false
 dataPlane:
   extraConfig:
     deployment:
@@ -102,7 +104,7 @@ dataPlane:
         name: apisix-routes
   extraVolumeMounts:
     - name: routes
-      mountPath: /opt/bitnami/apisix/conf/apisix.yaml
+      mountPath: /usr/local/apisix/conf/apisix.yaml
       subPath: apisix.yaml
 extraDeploy:
   - apiVersion: v1
@@ -118,6 +120,7 @@ extraDeploy:
                 nodes:
                     "127.0.0.1:1980": 1
                 type: roundrobin
+        #END
 ```
 
 ### Ingress

diff --git a/bitnami/apisix/templates/_helpers.tpl b/bitnami/apisix/templates/_helpers.tpl
@@ -353,6 +353,7 @@ Init container definition for waiting for the database to be ready
   env:
     - name: BITNAMI_DEBUG
       value: {{ ternary "true" "false" (or .context.Values.image.debug .context.Values.diagnosticMode.enabled) | quote }}
+    {{- if .context.Values.controlPlane.enabled }}
     - name: APISIX_ADMIN_API_TOKEN
       valueFrom:
         secretKeyRef:
@@ -363,6 +364,7 @@ Init container definition for waiting for the database to be ready
         secretKeyRef:
           name: {{ include "apisix.control-plane.secretName" .context }}
           key: {{ include "apisix.control-plane.viewerTokenKey" .context }}
+    {{- end }}
     {{- if (include "apisix.etcd.authEnabled" .context) }}
     - name: APISIX_ETCD_USER
       value: {{ include "apisix.etcd.user" .context }}
@@ -560,6 +562,7 @@ Render configuration for the dashboard and ingress-controller components
   env:
     - name: BITNAMI_DEBUG
       value: {{ ternary "true" "false" (or .context.Values.image.debug .context.Values.diagnosticMode.enabled) | quote }}
+    {{- if .context.Values.controlPlane.enabled }}
     - name: APISIX_ADMIN_API_TOKEN
       valueFrom:
         secretKeyRef:
@@ -570,6 +573,7 @@ Render configuration for the dashboard and ingress-controller components
         secretKeyRef:
           name: {{ include "apisix.control-plane.secretName" .context }}
           key: {{ include "apisix.control-plane.viewerTokenKey" .context }}
+    {{- end }}
     {{- if (include "apisix.etcd.authEnabled" .context) }}
     - name: APISIX_ETCD_USER
       value: {{ include "apisix.etcd.user" .context }}

diff --git a/bitnami/apisix/values.yaml b/bitnami/apisix/values.yaml
@@ -294,6 +294,7 @@ dataPlane:
           prefix: /apisix
           timeout: 30
         {{- end }}
+      {{- if or .Values.etcd.enabled .Values.externalEtcd.servers }}
       etcd:
         host:
           {{- if .Values.etcd.enabled  }}
@@ -314,6 +315,7 @@ dataPlane:
         user: "{{ print "{{APISIX_ETCD_USER}}" }}"
         password: "{{ print "{{APISIX_ETCD_PASSWORD}}" }}"
         {{- end }}
+      {{- end }}
       {{- if .Values.dataPlane.tls.enabled }}
       certs:
         {{- if .Values.dataPlane.tls.enabled }}