[bitnami/apisix] feat: ♻️ Use os-shell for config generation (#31455)

* [bitnami/apisix] feat: ♻️ Use os-shell for config generation Signed-off-by: Javier J. Salmerón García <[email protected]> * fix: 🐛 Change version Signed-off-by: Javier J. Salmerón García <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Javier J. Salmerón García <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
bitnami · Jan 17, 2025 · e808ba0 · e808ba0
1 parent a607b9f
commit e808ba0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/bitnami/apisix/CHANGELOG.md b/bitnami/apisix/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
-## 3.7.1 (2025-01-09)
+## 3.7.2 (2025-01-17)
 
-* [bitnami/apisix] Release 3.7.1 ([#31272](https://github.com/bitnami/charts/pull/31272))
+* [bitnami/apisix] feat: :recycle: Use os-shell for config generation ([#31455](https://github.com/bitnami/charts/pull/31455))
+
+## <small>3.7.1 (2025-01-09)</small>
+
+* [bitnami/*] Fix typo in README (#31052) ([b41a51d](https://github.com/bitnami/charts/commit/b41a51d1bd04841fc108b78d3b8357a5292771c8)), closes [#31052](https://github.com/bitnami/charts/issues/31052)
+* [bitnami/apisix] Release 3.7.1 (#31272) ([199b715](https://github.com/bitnami/charts/commit/199b7151ef54c3cc81ca09813e28e2b2ade50f2d)), closes [#31272](https://github.com/bitnami/charts/issues/31272)
 
 ## 3.7.0 (2024-12-10)
 

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.7.1
+version: 3.7.2
diff --git a/bitnami/apisix/templates/_helpers.tpl b/bitnami/apisix/templates/_helpers.tpl
@@ -315,7 +315,7 @@ Init container definition for waiting for the database to be ready
 # This init container renders and merges the APISIX configuration files, as well
 # as preparing the Nginx server. We need to use a volume because we're working with
 # ReadOnlyRootFilesystem
-- name: prepare-apisix
+- name: prepare-apisix-dirs
   image: {{ template "apisix.image" .context }}
   imagePullPolicy: {{ .context.Values.image.pullPolicy }}
   {{- $block := "" }}
@@ -337,9 +337,7 @@ Init container definition for waiting for the database to be ready
       ln -sf /opt/bitnami/apisix/openresty/luajit/share/lua/*/apisix /usr/local/apisix
       mkdir -p /usr/local/apisix/logs
       # Build final config.yaml with the sections of the different files
-      find /bitnami/apisix/conf -type f -name *.yaml -print0 | sort -z | xargs -0 yq eval-all '. as $item ireduce ({}; . * $item )' > /usr/local/apisix/conf/pre-render-config.yaml
-      render-template /usr/local/apisix/conf/pre-render-config.yaml > /usr/local/apisix/conf/config.yaml
-      rm /usr/local/apisix/conf/pre-render-config.yaml
+      cp /bitnami/apisix/rendered-conf/config.yaml /usr/local/apisix/conf/
       chmod 644 /usr/local/apisix/conf/config.yaml
       apisix init
       {{- if eq .component "control-plane" }}
@@ -390,15 +388,12 @@ Init container definition for waiting for the database to be ready
     - name: empty-dir
       mountPath: /usr/local/apisix
       subPath: app-tmp-dir
-    - name: config
-      mountPath: /bitnami/apisix/conf/00_default
+    - name: empty-dir
+      mountPath: /bitnami/apisix/rendered-conf
+      subPath: app-conf-dir
     - name: empty-dir
       mountPath: /tmp
       subPath: tmp-dir
-    {{- if or $block.extraConfig $block.extraConfigExistingConfigMap }}
-    - name: extra-config
-      mountPath: /bitnami/apisix/conf/01_extra
-    {{- end }}
     {{- if $block.tls.enabled }}
     - name: certs
       mountPath: /bitnami/certs
@@ -543,11 +538,15 @@ Render configuration for the dashboard and ingress-controller components
 # as preparing the Nginx server. We need to use a volume because we're working with
 # ReadOnlyRootFilesystem
 - name: render-conf
-  image: {{ template "apisix.image" .context }}
+  image: {{ template "apisix.wait-container.image" .context }}
   imagePullPolicy: {{ .context.Values.image.pullPolicy }}
   {{- $block := "" }}
   {{- if eq .component "ingress-controller" }}
   {{- $block = index .context.Values "ingressController" }}
+  {{- else if eq .component "control-plane" }}
+  {{- $block = index .context.Values "controlPlane" }}
+  {{- else if eq .component "data-plane" }}
+  {{- $block = index .context.Values "dataPlane" }}
   {{- else }}
   {{- $block = index .context.Values "dashboard" }}
   {{- end }}

diff --git a/bitnami/apisix/templates/control-plane/dep-ds.yaml b/bitnami/apisix/templates/control-plane/dep-ds.yaml
@@ -83,6 +83,7 @@ spec:
       {{- end }}
       initContainers:
         {{- include "apisix.waitForETCDInitContainer" . | nindent 8 }}
+        {{- include "apisix.renderConfInitContainer" (dict "component" "control-plane" "context" $) | nindent 8 }}
         {{- include "apisix.prepareApisixInitContainer" (dict "component" "control-plane" "context" $) | nindent 8 }}
         {{- if .Values.controlPlane.initContainers }}
         {{- include "common.tplvalues.render" (dict "value" .Values.controlPlane.initContainers "context" $) | nindent 8 }}

diff --git a/bitnami/apisix/templates/data-plane/dep-ds.yaml b/bitnami/apisix/templates/data-plane/dep-ds.yaml
@@ -85,6 +85,7 @@ spec:
         {{- if .Values.controlPlane.enabled }}
         {{- include "apisix.waitForControlPlaneInitContainer" . | nindent 8 }}
         {{- end }}
+        {{- include "apisix.renderConfInitContainer" (dict "component" "data-plane" "context" $) | nindent 8 }}
         {{- include "apisix.prepareApisixInitContainer" (dict "component" "data-plane" "context" $) | nindent 8 }}
         {{- if .Values.dataPlane.initContainers }}
           {{- include "common.tplvalues.render" (dict "value" .Values.dataPlane.initContainers "context" $) | nindent 8 }}