Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(helm): use short names instead of fqdns #4496

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix(helm): use short names instead of fqdns #4496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238b9c0
fix(helm): use short names instead of fqdns
fatih-acar Sep 30, 2024
ba48c28
fix(ci): commit helm changes
fatih-acar Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/update-compose-file-and-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions helm/templates/_env.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down