From 238b9c0ff2944f4394551c9aa66cad2664206a27 Mon Sep 17 00:00:00 2001
From: Fatih Acar <fatih@opsmill.com>
Date: Mon, 30 Sep 2024 09:23:40 +0200
Subject: [PATCH 1/2] fix(helm): use short names instead of fqdns

Signed-off-by: Fatih Acar <fatih@opsmill.com>
---
 helm/Chart.yaml         |  4 ++--
 helm/templates/_env.tpl | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 762ff48ca4..c29cb9a3d8 100644
--- 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
index f49c7b65f2..c33bf831fe 100644
--- a/helm/templates/_env.tpl
+++ b/helm/templates/_env.tpl
@@ -8,15 +8,15 @@ 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
@@ -24,7 +24,7 @@ Define default env variables if required.
 {{- 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,15 +51,15 @@ 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
@@ -67,7 +67,7 @@ Define default env variables if required.
 {{- 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,15 +94,15 @@ 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
@@ -110,7 +110,7 @@ Define default env variables if required.
 {{- 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

From ba48c28be7569fba8dbe22176a8968ac7474536d Mon Sep 17 00:00:00 2001
From: Fatih Acar <fatih@opsmill.com>
Date: Mon, 30 Sep 2024 09:25:32 +0200
Subject: [PATCH 2/2] fix(ci): commit helm changes

Signed-off-by: Fatih Acar <fatih@opsmill.com>
---
 .github/workflows/update-compose-file-and-chart.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-compose-file-and-chart.yml b/.github/workflows/update-compose-file-and-chart.yml
index 6ed2df29b8..e270dd9a66 100644
--- a/.github/workflows/update-compose-file-and-chart.yml
+++ b/.github/workflows/update-compose-file-and-chart.yml
@@ -49,14 +49,15 @@ jobs:
         run: "poetry run invoke dev.update-docker-compose"
       - name: "Update AppVersion in helm/chart.yaml file"
         run: "poetry run invoke dev.update-helm-chart"
-      - name: Commit docker-compose.yml
+      - name: Commit docker-compose.yml and helm
         uses: github-actions-x/commit@v2.9
         with:
           github-token: ${{ secrets.GH_INFRAHUB_BOT_TOKEN }}
           push-branch: 'stable'
-          commit-message: 'chore: update docker-compose'
+          commit-message: 'chore: update docker-compose and helm chart'
           files: |
             docker-compose.yml
+            helm/Chart.yaml
           name: opsmill-bot
           email: github-bot@opsmill.com
           rebase: true