fix: read postgres and prometheus address from values (#84)

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.8.0
+version: 0.9.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.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)
+![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.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
 

charts/api7/templates/dashboard-deploy.yaml

@@ -36,14 +36,14 @@ spec:
         {{- 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 api7-postgresql 5432; do echo waiting for postgresql `date`; sleep 2; done;" ]
+          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://api7-prometheus-server:9090;do echo waiting for prometheus `date`; sleep 2; done;" ]
+          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 }}