From 5a81faa729cbdc1f078ce37827c6156a903a6b70 Mon Sep 17 00:00:00 2001 From: Edson Matimbe Date: Thu, 14 May 2026 10:38:01 +0200 Subject: [PATCH 1/5] feat(api7): add extraInitContainers support to dashboard, developer_portal and dp_manager deployments --- charts/api7/templates/dashboard-deploy.yaml | 4 ++++ charts/api7/templates/developer-portal-deploy.yaml | 4 ++++ charts/api7/templates/dp-manager-deploy.yaml | 4 ++++ charts/api7/values.yaml | 3 +++ 4 files changed, 15 insertions(+) diff --git a/charts/api7/templates/dashboard-deploy.yaml b/charts/api7/templates/dashboard-deploy.yaml index 692eb0f..ef4b3ff 100644 --- a/charts/api7/templates/dashboard-deploy.yaml +++ b/charts/api7/templates/dashboard-deploy.yaml @@ -51,6 +51,10 @@ spec: secret: secretName: {{ .Values.prometheus.server.existingSecret | quote }} {{- end }} + {{- if .Values.dashboard.extraInitContainers }} + initContainers: + {{- toYaml .Values.dashboard.extraInitContainers | nindent 8 }} + {{- end }} containers: - name: dashboard securityContext: diff --git a/charts/api7/templates/developer-portal-deploy.yaml b/charts/api7/templates/developer-portal-deploy.yaml index 5c20431..e6cc544 100644 --- a/charts/api7/templates/developer-portal-deploy.yaml +++ b/charts/api7/templates/developer-portal-deploy.yaml @@ -47,6 +47,10 @@ spec: secret: secretName: {{ .Values.developer_portal.keyCertSecret | quote }} {{- end }} + {{- if .Values.developer_portal.extraInitContainers }} + initContainers: + {{- toYaml .Values.developer_portal.extraInitContainers | nindent 8 }} + {{- end }} containers: - name: developer-portal securityContext: diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml index f055f94..fa8e1f4 100644 --- a/charts/api7/templates/dp-manager-deploy.yaml +++ b/charts/api7/templates/dp-manager-deploy.yaml @@ -46,6 +46,10 @@ spec: {{- if .Values.dashboard.extraVolumes }} {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }} {{- end }} + {{- if .Values.dp_manager.extraInitContainers }} + initContainers: + {{- toYaml .Values.dp_manager.extraInitContainers | nindent 8 }} + {{- end }} containers: - name: dp-manager securityContext: diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml index c2fa2c5..7f481d8 100644 --- a/charts/api7/values.yaml +++ b/charts/api7/values.yaml @@ -34,6 +34,7 @@ dashboard: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ @@ -70,6 +71,7 @@ dp_manager: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ @@ -113,6 +115,7 @@ developer_portal: extraEnvVars: [] extraVolumes: [] extraVolumeMounts: [] + extraInitContainers: [] podLabels: {} # -- Topology Spread Constraints for pod assignment # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ From d3a98dce26d16bbc2d3e9276ceabd32b0f0e43f8 Mon Sep 17 00:00:00 2001 From: Edson Matimbe Date: Thu, 14 May 2026 10:49:07 +0200 Subject: [PATCH 2/5] fix: use template render from api7 instead of plain yaml render Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- charts/api7/templates/dashboard-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/api7/templates/dashboard-deploy.yaml b/charts/api7/templates/dashboard-deploy.yaml index ef4b3ff..701a23d 100644 --- a/charts/api7/templates/dashboard-deploy.yaml +++ b/charts/api7/templates/dashboard-deploy.yaml @@ -53,7 +53,7 @@ spec: {{- end }} {{- if .Values.dashboard.extraInitContainers }} initContainers: - {{- toYaml .Values.dashboard.extraInitContainers | nindent 8 }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraInitContainers "context" $) | nindent 8 }} {{- end }} containers: - name: dashboard From 6349d4ce9738a251e6c5009e900abb935857a74f Mon Sep 17 00:00:00 2001 From: Edson Matimbe Date: Thu, 14 May 2026 11:02:30 +0200 Subject: [PATCH 3/5] feat(api7): add extraInitContainers support to dashboard, developer_portal and dp_manager deployments --- charts/api7/Chart.yaml | 2 +- charts/api7/README.md | 3 +++ charts/api7/templates/developer-portal-deploy.yaml | 2 +- charts/api7/templates/dp-manager-deploy.yaml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml index f71e39c..8ea83c6 100644 --- a/charts/api7/Chart.yaml +++ b/charts/api7/Chart.yaml @@ -15,7 +15,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: 0.17.55 +version: 0.18.0 # 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 diff --git a/charts/api7/README.md b/charts/api7/README.md index 9518cf7..031293a 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -26,6 +26,7 @@ A Helm chart for Kubernetes | dashboard.extraEnvVars | list | `[]` | | | dashboard.extraVolumeMounts | list | `[]` | | | dashboard.extraVolumes | list | `[]` | | +| dashboard.extraInitContainers | list | `[]` | | | dashboard.image.pullPolicy | string | `"Always"` | | | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | | | dashboard.image.tag | string | `"v3.9.12"` | | @@ -116,6 +117,7 @@ A Helm chart for Kubernetes | developer_portal.extraEnvVars | list | `[]` | | | developer_portal.extraVolumeMounts | list | `[]` | | | developer_portal.extraVolumes | list | `[]` | | +| developer_portal.extraInitContainers | list | `[]` | | | developer_portal.image.pullPolicy | string | `"Always"` | | | developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | | | developer_portal.image.tag | string | `"v3.9.12"` | | @@ -161,6 +163,7 @@ A Helm chart for Kubernetes | dp_manager.extraEnvVars | list | `[]` | | | dp_manager.extraVolumeMounts | list | `[]` | | | dp_manager.extraVolumes | list | `[]` | | +| dp_manager.extraInitContainers | list | `[]` | | | dp_manager.image.pullPolicy | string | `"Always"` | | | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | | | dp_manager.image.tag | string | `"v3.9.12"` | | diff --git a/charts/api7/templates/developer-portal-deploy.yaml b/charts/api7/templates/developer-portal-deploy.yaml index e6cc544..2b581bd 100644 --- a/charts/api7/templates/developer-portal-deploy.yaml +++ b/charts/api7/templates/developer-portal-deploy.yaml @@ -49,7 +49,7 @@ spec: {{- end }} {{- if .Values.developer_portal.extraInitContainers }} initContainers: - {{- toYaml .Values.developer_portal.extraInitContainers | nindent 8 }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.developer_portal.extraInitContainers "context" $) | nindent 8 }} {{- end }} containers: - name: developer-portal diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml index fa8e1f4..7ece09d 100644 --- a/charts/api7/templates/dp-manager-deploy.yaml +++ b/charts/api7/templates/dp-manager-deploy.yaml @@ -48,7 +48,7 @@ spec: {{- end }} {{- if .Values.dp_manager.extraInitContainers }} initContainers: - {{- toYaml .Values.dp_manager.extraInitContainers | nindent 8 }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraInitContainers "context" $) | nindent 8 }} {{- end }} containers: - name: dp-manager From a4640c1036623b001c18e1f54983bd3695bb2944 Mon Sep 17 00:00:00 2001 From: jarvis9443 Date: Thu, 14 May 2026 21:32:18 +0800 Subject: [PATCH 4/5] chore: regenerate README.md with helm-docs --- charts/api7/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/api7/README.md b/charts/api7/README.md index 031293a..051756f 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -1,6 +1,6 @@ # api7ee3 -![Version: 0.17.55](https://img.shields.io/badge/Version-0.17.55-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.12](https://img.shields.io/badge/AppVersion-3.9.12-informational?style=flat-square) +![Version: 0.18.0](https://img.shields.io/badge/Version-0.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.12](https://img.shields.io/badge/AppVersion-3.9.12-informational?style=flat-square) A Helm chart for Kubernetes @@ -24,9 +24,9 @@ A Helm chart for Kubernetes |-----|------|---------|-------------| | affinity | object | `{}` | | | dashboard.extraEnvVars | list | `[]` | | +| dashboard.extraInitContainers | list | `[]` | | | dashboard.extraVolumeMounts | list | `[]` | | | dashboard.extraVolumes | list | `[]` | | -| dashboard.extraInitContainers | list | `[]` | | | dashboard.image.pullPolicy | string | `"Always"` | | | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` | | | dashboard.image.tag | string | `"v3.9.12"` | | @@ -115,9 +115,9 @@ A Helm chart for Kubernetes | dashboard_service.tlsPort | int | `7443` | | | dashboard_service.type | string | `"ClusterIP"` | | | developer_portal.extraEnvVars | list | `[]` | | +| developer_portal.extraInitContainers | list | `[]` | | | developer_portal.extraVolumeMounts | list | `[]` | | | developer_portal.extraVolumes | list | `[]` | | -| developer_portal.extraInitContainers | list | `[]` | | | developer_portal.image.pullPolicy | string | `"Always"` | | | developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` | | | developer_portal.image.tag | string | `"v3.9.12"` | | @@ -161,9 +161,9 @@ A Helm chart for Kubernetes | developer_portal_service.port | int | `4321` | | | developer_portal_service.type | string | `"ClusterIP"` | | | dp_manager.extraEnvVars | list | `[]` | | +| dp_manager.extraInitContainers | list | `[]` | | | dp_manager.extraVolumeMounts | list | `[]` | | | dp_manager.extraVolumes | list | `[]` | | -| dp_manager.extraInitContainers | list | `[]` | | | dp_manager.image.pullPolicy | string | `"Always"` | | | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` | | | dp_manager.image.tag | string | `"v3.9.12"` | | From 9d52658f24b84dacff66ade9c8fdfb575fcb010f Mon Sep 17 00:00:00 2001 From: jarvis9443 Date: Thu, 14 May 2026 21:42:12 +0800 Subject: [PATCH 5/5] fix(api7): use dp_manager values for volumes/volumeMounts in dp-manager deployment The dp-manager-deploy.yaml template incorrectly referenced .Values.dashboard.extraVolumes and .Values.dashboard.extraVolumeMounts instead of .Values.dp_manager.extraVolumes and .Values.dp_manager.extraVolumeMounts. This made it impossible to mount custom volumes in the dp-manager pod independently of the dashboard. --- charts/api7/templates/dp-manager-deploy.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml index 7ece09d..bbf52dd 100644 --- a/charts/api7/templates/dp-manager-deploy.yaml +++ b/charts/api7/templates/dp-manager-deploy.yaml @@ -43,8 +43,8 @@ spec: secret: secretName: {{ .Values.prometheus.server.existingSecret | quote }} {{- end }} - {{- if .Values.dashboard.extraVolumes }} - {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }} + {{- if .Values.dp_manager.extraVolumes }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraVolumes "context" $) | nindent 8 }} {{- end }} {{- if .Values.dp_manager.extraInitContainers }} initContainers: @@ -89,8 +89,8 @@ spec: name: prometheus_ssl readOnly: true {{- end }} - {{- if .Values.dashboard.extraVolumeMounts }} - {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }} + {{- if .Values.dp_manager.extraVolumeMounts }} + {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dp_manager.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} resources: {{- if .Values.dp_manager.resources }}