fix: init container to waiting other componenets (#82)

Signed-off-by: Nic <[email protected]>

Author: nic-6443

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.7.0
+version: 0.8.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

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -20,19 +20,19 @@ A Helm chart for Kubernetes
 | busybox.image.tag | float | `1.28` |  |
 | dashboard.image.pullPolicy | string | `"IfNotPresent"` |  |
 | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` |  |
-| dashboard.image.tag | string | `"v3.2.6.1"` |  |
+| dashboard.image.tag | string | `"v3.2.7.1"` |  |
 | dashboard.replicaCount | int | `1` |  |
 | dashboard_configuration.authentication_config.session_secret | string | `"changeme"` |  |
 | dashboard_configuration.console.addr | string | `"http://127.0.0.1:3000"` |  |
-| dashboard_configuration.database.postgres.addr | string | `"api7ee3-postgresql:5432"` |  |
+| dashboard_configuration.database.postgres.addr | string | `"api7-postgresql:5432"` |  |
 | dashboard_configuration.database.postgres.database | string | `"api7ee"` |  |
 | dashboard_configuration.database.postgres.password | string | `"changeme"` |  |
 | dashboard_configuration.database.postgres.user | string | `"api7ee"` |  |
 | dashboard_configuration.database.type | string | `"postgres"` |  |
 | dashboard_configuration.log.level | string | `"info"` |  |
 | dashboard_configuration.log.output | string | `"stderr"` |  |
 | dashboard_configuration.login.source | string | `"DB"` |  |
-| dashboard_configuration.prometheus.addr | string | `"http://api7ee3-prometheus-server:9090"` |  |
+| dashboard_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dashboard_configuration.prometheus.whitelist[0] | string | `"/api/v1/query_range"` |  |
 | dashboard_configuration.prometheus.whitelist[1] | string | `"/api/v1/query"` |  |
 | dashboard_configuration.prometheus.whitelist[2] | string | `"/api/v1/format_query"` |  |
@@ -47,22 +47,20 @@ A Helm chart for Kubernetes
 | dashboard_configuration.server.listen.port | int | `7080` |  |
 | dashboard_configuration.session_options_config.same_site | string | `"lax"` |  |
 | dashboard_configuration.session_options_config.secure | bool | `false` |  |
-| dashboard_configuration.user_manager.logout_url | string | `"https://login.api7.ai/v2/logout"` |  |
-| dashboard_configuration.user_manager.oidc_provider | string | `"keycloak"` |  |
 | dashboard_service.port | int | `7080` |  |
 | dashboard_service.type | string | `"ClusterIP"` |  |
 | dp_manager.image.pullPolicy | string | `"IfNotPresent"` |  |
 | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` |  |
-| dp_manager.image.tag | string | `"v3.2.6.1"` |  |
+| dp_manager.image.tag | string | `"v3.2.7.1"` |  |
 | dp_manager.replicaCount | int | `1` |  |
-| dp_manager_configuration.database.postgres.addr | string | `"api7ee3-postgresql:5432"` |  |
+| dp_manager_configuration.database.postgres.addr | string | `"api7-postgresql:5432"` |  |
 | dp_manager_configuration.database.postgres.database | string | `"api7ee"` |  |
 | dp_manager_configuration.database.postgres.password | string | `"changeme"` |  |
 | dp_manager_configuration.database.postgres.user | string | `"api7ee"` |  |
 | dp_manager_configuration.database.type | string | `"postgres"` |  |
 | dp_manager_configuration.log.level | string | `"info"` |  |
 | dp_manager_configuration.log.output | string | `"stderr"` |  |
-| dp_manager_configuration.prometheus.addr | string | `"http://api7ee3-prometheus-server:9090"` |  |
+| dp_manager_configuration.prometheus.addr | string | `"http://api7-prometheus-server:9090"` |  |
 | dp_manager_configuration.server.listen.host | string | `"0.0.0.0"` |  |
 | dp_manager_configuration.server.listen.port | int | `7900` |  |
 | dp_manager_configuration.server.status_listen.host | string | `"0.0.0.0"` |  |
@@ -79,12 +77,14 @@ A Helm chart for Kubernetes
 | postgresql.auth.password | string | `"changeme"` |  |
 | postgresql.auth.username | string | `"api7ee"` |  |
 | postgresql.builtin | bool | `true` |  |
-| postgresql.host | string | `"api7ee3-postgresql"` |  |
-| postgresql.port | int | `5432` |  |
+| postgresql.fullnameOverride | string | `"api7-postgresql"` |  |
 | postgresql.primary.persistence.size | string | `"256Gi"` |  |
+| postgresql.primary.service.ports.postgresql | int | `5432` |  |
 | postgresql.readReplicas.persistence.size | string | `"256Gi"` |  |
+| postgresql.readReplicas.service.ports.postgresql | int | `5432` |  |
 | prometheus.alertmanager.enabled | bool | `false` |  |
 | prometheus.builtin | bool | `true` |  |
+| prometheus.fullnameOverride | string | `"api7-prometheus"` |  |
 | prometheus.server.configuration | string | `""` |  |
 | prometheus.server.enableAdminAPI | bool | `true` |  |
 | prometheus.server.enableRemoteWriteReceiver | bool | `true` |  |

charts/api7/templates/dashboard-deploy.yaml

@@ -31,14 +31,22 @@ spec:
         - name: config
           configMap:
             name: {{ include "api7ee3.fullname" . }}-dashboard-config
+      {{- 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.host }} {{ .Values.postgresql.port }}; do echo waiting for postgresql `date`; sleep 2; done;" ]
-      {{- if .Values.prometheus.builtin }}
+          command: [ 'sh', '-c', "until nc -z -v -w3 api7-postgresql 5432; do echo waiting for postgresql `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 {{ .Values.dashboard_configuration.prometheus.addr }};do echo waiting for prometheus `date`; sleep 2; done;" ]
+          command: [ 'sh', '-c', "until wget --timeout=3 -q --spider http://api7-prometheus-server:9090;do echo waiting for prometheus `date`; sleep 2; done;" ]
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+        {{- end }}
       {{- end }}
       containers:
         - name: dashboard

charts/api7/templates/dp-manager-deploy.yaml

@@ -35,6 +35,8 @@ spec:
         - name: wait-for-dashboard
           image: "{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}"
           command: [ 'sh', '-c', "until wget --timeout=3 -q --spider {{ include "api7ee3.fullname" . }}-dashboard:{{ .Values.dashboard_service.port }}/healthz;do echo waiting for dashboard `date`; sleep 2; done;" ]
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
       containers:
         - name: dp-manager
           securityContext:

charts/api7/values.yaml

@@ -8,15 +8,15 @@ dashboard:
     repository: api7/api7-ee-3-integrated
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.6.1"
+    tag: "v3.2.7.1"
 
 dp_manager:
   replicaCount: 1
   image:
     repository: api7/api7-ee-dp-manager
     pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-    tag: "v3.2.6.1"
+    tag: "v3.2.7.1"
 
 imagePullSecret: ""
 nameOverride: ""
@@ -77,6 +77,7 @@ busybox:
 
 prometheus:
   builtin: true
+  fullnameOverride: "api7-prometheus"
   alertmanager:
     enabled: false
   server:
@@ -96,15 +97,20 @@ prometheus:
     configuration: ""
 
 postgresql:
-  host: api7ee3-postgresql
-  port: 5432
   builtin: true
+  fullnameOverride: "api7-postgresql"
   primary:
     persistence:
       size: 256Gi
+    service:
+      ports:
+        postgresql: 5432
   readReplicas:
     persistence:
       size: 256Gi
+    service:
+      ports:
+        postgresql: 5432
   auth:
     username: api7ee
     password: changeme
@@ -126,9 +132,6 @@ dashboard_configuration:
     secure: false
   authentication_config:
     session_secret: "changeme"
-  user_manager:
-    oidc_provider: "keycloak"
-    logout_url: "https://login.api7.ai/v2/logout"
   login:
     source: DB
   log:
@@ -137,14 +140,14 @@ dashboard_configuration:
   database:
     type: postgres
     postgres:
-      addr: api7ee3-postgresql:5432
+      addr: api7-postgresql:5432
       user: api7ee
       password: "changeme"
       database: api7ee
     # max_idle_conns: 10
     # max_open_conns: 30
   prometheus:
-    addr: "http://api7ee3-prometheus-server:9090"
+    addr: "http://api7-prometheus-server:9090"
     whitelist:
       - "/api/v1/query_range"
       - "/api/v1/query"
@@ -168,9 +171,9 @@ dp_manager_configuration:
   database:
     type: postgres
     postgres:
-      addr: api7ee3-postgresql:5432
+      addr: api7-postgresql:5432
       user: api7ee
       password: "changeme"
       database: api7ee
   prometheus:
-    addr: "http://api7ee3-prometheus-server:9090"
+    addr: "http://api7-prometheus-server:9090"