Fix port substitution in halyard config (#134)

OpsMx · May 7, 2021 · 316bc99 · 316bc99
1 parent 2d0f8e2
commit 316bc99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 3.6.8
+version: 3.6.9
 appVersion: 3.6.2
 description: OES is a non-forked version of OSS spinnaker
 icon: https://www.opsmx.com/images/logo.png

diff --git a/charts/oes/charts/spinnaker/templates/configmap/halyard-config.yaml b/charts/oes/charts/spinnaker/templates/configmap/halyard-config.yaml
@@ -162,9 +162,17 @@ data:
     # Use Deck to route to Gate
     {{- if not .Values.gitopsHalyard.enabled }}
     # Configure override urls in halyard config
+    {{- if .Values.global.spinDeck.port }}
+    $HAL_COMMAND config security ui edit --no-validate --override-base-url {{ .Values.global.spinDeck.protocol }}://{{ .Values.global.spinDeck.host }}:{{ .Values.global.spinDeck.port }}
+    {{- else }}
     $HAL_COMMAND config security ui edit --no-validate --override-base-url {{ .Values.global.spinDeck.protocol }}://{{ .Values.global.spinDeck.host }}
+    {{- end }}
+    {{- if .Values.global.spinGate.port }}
+    $HAL_COMMAND config security api edit --no-validate --override-base-url {{ .Values.global.spinGate.protocol }}://{{ .Values.global.spinGate.host }}:{{ .Values.global.spinGate.port }}
+    {{- else }}
     $HAL_COMMAND config security api edit --no-validate --override-base-url {{ .Values.global.spinGate.protocol }}://{{ .Values.global.spinGate.host }}
     {{- end }}
+    {{- end }}
     {{- range $index, $feature := .Values.spinnakerFeatureFlags }}
     $HAL_COMMAND config features edit --{{ $feature }} true
     {{- end }}