From 29f95135d1d1ed40c6a1d8ea3496907ce62758ea Mon Sep 17 00:00:00 2001 From: Nic Date: Mon, 9 Feb 2026 16:11:07 +0800 Subject: [PATCH] chore: remove init containers for startup order Signed-off-by: Nic --- charts/api7/Chart.yaml | 2 +- charts/api7/README.md | 4 +--- charts/api7/templates/dashboard-deploy.yaml | 17 ----------------- .../api7/templates/developer-portal-deploy.yaml | 10 ---------- charts/api7/templates/dp-manager-deploy.yaml | 10 ---------- charts/api7/values.yaml | 5 ----- 6 files changed, 2 insertions(+), 46 deletions(-) diff --git a/charts/api7/Chart.yaml b/charts/api7/Chart.yaml index d0592e2..2c4f7ec 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.43 +version: 0.17.44 # 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 054f355..ff113ab 100644 --- a/charts/api7/README.md +++ b/charts/api7/README.md @@ -1,6 +1,6 @@ # api7ee3 -![Version: 0.17.43](https://img.shields.io/badge/Version-0.17.43-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.4](https://img.shields.io/badge/AppVersion-3.9.4-informational?style=flat-square) +![Version: 0.17.44](https://img.shields.io/badge/Version-0.17.44-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.4](https://img.shields.io/badge/AppVersion-3.9.4-informational?style=flat-square) A Helm chart for Kubernetes @@ -22,8 +22,6 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | | -| busybox.image.repository | string | `"docker.io/busybox"` | | -| busybox.image.tag | float | `1.28` | | | dashboard.extraEnvVars | list | `[]` | | | dashboard.extraVolumeMounts | list | `[]` | | | dashboard.extraVolumes | list | `[]` | | diff --git a/charts/api7/templates/dashboard-deploy.yaml b/charts/api7/templates/dashboard-deploy.yaml index d59c0de..692eb0f 100644 --- a/charts/api7/templates/dashboard-deploy.yaml +++ b/charts/api7/templates/dashboard-deploy.yaml @@ -51,23 +51,6 @@ spec: secret: secretName: {{ .Values.prometheus.server.existingSecret | quote }} {{- end }} - {{- if or .Values.postgresql.builtin .Values.prometheus.builtin }} - initContainers: - {{- if .Values.postgresql.builtin }} - - name: wait-for-postgresql - image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}" - command: [ 'sh', '-c', "until nc -z -v -w3 {{ .Values.postgresql.fullnameOverride }} {{ .Values.postgresql.primary.service.ports.postgresql }}; do echo waiting for builtin postgresql service `date`; sleep 2; done;" ] - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - {{- end }} - {{- if .Values.prometheus.builtin }} - - name: wait-for-prometheus - image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}" - command: [ 'sh', '-c', "until wget --timeout=3 -q --spider http://{{ .Values.prometheus.fullnameOverride }}-server:{{ .Values.prometheus.server.service.ports.http }}; do echo waiting for builtin prometheus service `date`; sleep 2; done;" ] - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - {{- end }} - {{- end }} containers: - name: dashboard securityContext: diff --git a/charts/api7/templates/developer-portal-deploy.yaml b/charts/api7/templates/developer-portal-deploy.yaml index 272aeed..5c20431 100644 --- a/charts/api7/templates/developer-portal-deploy.yaml +++ b/charts/api7/templates/developer-portal-deploy.yaml @@ -47,16 +47,6 @@ spec: secret: secretName: {{ .Values.developer_portal.keyCertSecret | quote }} {{- end }} - initContainers: - - name: wait-for-dashboard - image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}" - {{- if not .Values.dashboard_configuration.server.listen.disable }} - command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.port }};do echo waiting for dashboard `date`; sleep 2; done;" ] - {{- else }} - command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.tlsPort }};do echo waiting for dashboard `date`; sleep 2; done;" ] - {{- end }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} containers: - name: developer-portal securityContext: diff --git a/charts/api7/templates/dp-manager-deploy.yaml b/charts/api7/templates/dp-manager-deploy.yaml index 62cdd8b..f055f94 100644 --- a/charts/api7/templates/dp-manager-deploy.yaml +++ b/charts/api7/templates/dp-manager-deploy.yaml @@ -46,16 +46,6 @@ spec: {{- if .Values.dashboard.extraVolumes }} {{- include "api7ee3.tplvalues.render" (dict "value" .Values.dashboard.extraVolumes "context" $) | nindent 8 }} {{- end }} - initContainers: - - name: wait-for-dashboard - image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}" - {{- if not .Values.dashboard_configuration.server.listen.disable }} - command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.port }};do echo waiting for dashboard `date`; sleep 2; done;" ] - {{- else }} - command: [ 'sh', '-c', "until nc -z -v -w3 {{ include "api7ee3.fullname" . }}-dashboard {{ .Values.dashboard_service.tlsPort }};do echo waiting for dashboard `date`; sleep 2; done;" ] - {{- end }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} containers: - name: dp-manager securityContext: diff --git a/charts/api7/values.yaml b/charts/api7/values.yaml index aa4cc5d..9c35f6a 100644 --- a/charts/api7/values.yaml +++ b/charts/api7/values.yaml @@ -240,11 +240,6 @@ affinity: {} # The value is evaluated as a template topologySpreadConstraints: [] -busybox: - image: - repository: docker.io/busybox - tag: 1.28 - prometheus: builtin: true fullnameOverride: "api7-prometheus"