fix(helm): use short names instead of fqdns

Signed-off-by: Fatih Acar <fatih@opsmill.com>
opsmill · Sep 30, 2024 · 1454f2c · 1454f2c
1 parent 78b4523
commit 1454f2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -14,12 +14,12 @@ 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: 2.6.0
+version: 2.7.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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.15.2"
+appVersion: "0.16.1"
 
 dependencies:
   - name: neo4j

diff --git a/helm/templates/_env.tpl b/helm/templates/_env.tpl
@@ -8,23 +8,23 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_ADDRESS }}
 - name: INFRAHUB_ADDRESS
-  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000
+  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_INTERNAL_ADDRESS }}
 - name: INFRAHUB_INTERNAL_ADDRESS
-  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000"
+  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000"
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_DB_ADDRESS }}
 - name: INFRAHUB_DB_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-database.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-database"
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_DB_PORT }}
 - name: INFRAHUB_DB_PORT
   value: "{{ .Values.neo4j.services.neo4j.ports.bolt.port }}"
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_BROKER_ADDRESS }}
 - name: INFRAHUB_BROKER_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-message-queue.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-message-queue"
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_BROKER_USERNAME }}
 - name: INFRAHUB_BROKER_USERNAME
@@ -36,7 +36,7 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_CACHE_ADDRESS }}
 - name: INFRAHUB_CACHE_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-cache-master.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-cache-master"
 {{- end }}
 {{- if not .Values.infrahubDemoData.env.INFRAHUB_CACHE_PORT }}
 - name: INFRAHUB_CACHE_PORT
@@ -51,23 +51,23 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_ADDRESS }}
 - name: INFRAHUB_ADDRESS
-  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000
+  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_INTERNAL_ADDRESS }}
 - name: INFRAHUB_INTERNAL_ADDRESS
-  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000"
+  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000"
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_DB_ADDRESS }}
 - name: INFRAHUB_DB_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-database.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-database"
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_DB_PORT }}
 - name: INFRAHUB_DB_PORT
   value: "{{ .Values.neo4j.services.neo4j.ports.bolt.port }}"
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_BROKER_ADDRESS }}
 - name: INFRAHUB_BROKER_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-message-queue.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-message-queue"
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_BROKER_USERNAME }}
 - name: INFRAHUB_BROKER_USERNAME
@@ -79,7 +79,7 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_CACHE_ADDRESS }}
 - name: INFRAHUB_CACHE_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-cache-master.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-cache-master"
 {{- end }}
 {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_CACHE_PORT }}
 - name: INFRAHUB_CACHE_PORT
@@ -94,23 +94,23 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_ADDRESS }}
 - name: INFRAHUB_ADDRESS
-  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000
+  value: http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_INTERNAL_ADDRESS }}
 - name: INFRAHUB_INTERNAL_ADDRESS
-  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}:8000"
+  value: "http://{{ include "infrahub-helm.fullname" . }}-infrahub-server:8000"
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_DB_ADDRESS }}
 - name: INFRAHUB_DB_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-database.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-database"
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_DB_PORT }}
 - name: INFRAHUB_DB_PORT
   value: "{{ .Values.neo4j.services.neo4j.ports.bolt.port }}"
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_BROKER_ADDRESS }}
 - name: INFRAHUB_BROKER_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-message-queue.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-message-queue"
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_BROKER_USERNAME }}
 - name: INFRAHUB_BROKER_USERNAME
@@ -122,7 +122,7 @@ Define default env variables if required.
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_CACHE_ADDRESS }}
 - name: INFRAHUB_CACHE_ADDRESS
-  value: "{{ include "infrahub-helm.fullname" . }}-cache-master.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"
+  value: "{{ include "infrahub-helm.fullname" . }}-cache-master"
 {{- end }}
 {{- if not .Values.infrahubGit.infrahubGit.env.INFRAHUB_CACHE_PORT }}
 - name: INFRAHUB_CACHE_PORT