Skip to content

Commit 7efd57d

Browse files
committed
fix(helm): do not set default message queue password
Otherwise we cannot use secrets to provide a password. Signed-off-by: Fatih Acar <[email protected]>
1 parent 99d3266 commit 7efd57d

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.2.0
18+
version: 3.2.1
1919
# This is the version number of the application being deployed. This version number should be
2020
# incremented each time you make changes to the application. Versions are not expected to
2121
# follow Semantic Versioning. They should reflect the version the application is using.

helm/templates/_env.tpl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ Define default env variables if required.
3030
- name: INFRAHUB_BROKER_USERNAME
3131
value: {{ .Values.rabbitmq.auth.username | quote }}
3232
{{- end }}
33-
{{- if not .Values.infrahubDemoData.env.INFRAHUB_BROKER_PASSWORD }}
34-
- name: INFRAHUB_BROKER_PASSWORD
35-
value: {{ .Values.rabbitmq.auth.password | quote }}
36-
{{- end }}
3733
{{- if not .Values.infrahubDemoData.env.INFRAHUB_CACHE_ADDRESS }}
3834
- name: INFRAHUB_CACHE_ADDRESS
3935
value: "{{ include "infrahub-helm.fullname" . }}-cache-master"
@@ -73,10 +69,6 @@ Define default env variables if required.
7369
- name: INFRAHUB_BROKER_USERNAME
7470
value: {{ .Values.rabbitmq.auth.username | quote }}
7571
{{- end }}
76-
{{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_BROKER_PASSWORD }}
77-
- name: INFRAHUB_BROKER_PASSWORD
78-
value: {{ .Values.rabbitmq.auth.password | quote }}
79-
{{- end }}
8072
{{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_CACHE_ADDRESS }}
8173
- name: INFRAHUB_CACHE_ADDRESS
8274
value: "{{ include "infrahub-helm.fullname" . }}-cache-master"
@@ -116,10 +108,6 @@ Define default env variables if required.
116108
- name: INFRAHUB_BROKER_USERNAME
117109
value: {{ .Values.rabbitmq.auth.username | quote }}
118110
{{- end }}
119-
{{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_BROKER_PASSWORD }}
120-
- name: INFRAHUB_BROKER_PASSWORD
121-
value: {{ .Values.rabbitmq.auth.password | quote }}
122-
{{- end }}
123111
{{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_CACHE_ADDRESS }}
124112
- name: INFRAHUB_CACHE_ADDRESS
125113
value: "{{ include "infrahub-helm.fullname" . }}-cache-master.{{ .Release.Namespace }}.svc.{{ .Values.global.kubernetesClusterDomain }}"

0 commit comments

Comments
 (0)