Fix issue with spinnaker url substitution (#90)

OpsMx · Feb 11, 2021 · 6e7188f · 6e7188f
1 parent b06f40d
commit 6e7188f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 3.5.2
+version: 3.5.3
 appVersion: 3.5.0
 description: OES is a non-forked version of OSS spinnaker
 icon: https://www.opsmx.com/images/logo.png

diff --git a/charts/oes/config/oes-dashboard/dashboard-local.yml b/charts/oes/config/oes-dashboard/dashboard-local.yml
@@ -9,5 +9,5 @@ app:
 {{- if .Values.dashboard.config.spinnakerLink }}
 spinnakerLink: {{ .Values.dashboard.config.spinnakerLink }}
 {{- else }}
-spinnakerLink: {{ .Values.spinnaker.ingress.protocol }}://{{ .Values.spinnaker.ingress.host }}
+spinnakerLink: {{ .Values.global.spinDeck.protocol }}://{{ .Values.global.spinDeck.host }}
 {{- end }}
diff --git a/charts/oes/config/oes-sapor/application.yml b/charts/oes/config/oes-sapor/application.yml
@@ -7,7 +7,7 @@ spinnaker:
 {{- if .Values.sapor.config.spinnaker.spinExternalGateURL }}
   externalBaseUrl: {{ .Values.sapor.config.spinnaker.spinExternalGateURL }}
 {{- else }}
-  externalBaseUrl: {{ .Values.spinnaker.ingressGate.protocol }}://{{ .Values.spinnaker.ingressGate.host }}
+  externalBaseUrl: {{ .Values.global.spinGate.protocol }}://{{ .Values.global.spinGate.host }}
 {{- end }}
   ldap:
     enabled: {{ .Values.sapor.config.spinnaker.ldap.ldapEnabled }}

diff --git a/charts/oes/values.yaml b/charts/oes/values.yaml
@@ -242,7 +242,7 @@ dashboard:
     app:
       sync:
         enabled: true
-    ## By default spinnakerLink is {{ .Values.spinnaker.ingress.protocol }}://{{ .Values.spinnaker.ingress.host }}
+    ## By default spinnakerLink is {{ .Values.global.spinDeck.protocol }}://{{ .Values.global.spinDeck.host }}
     ## If spinnaker is exposed on Load balancer instead of ingress, set this value to external IP of spinnaker UI
     #spinnakerLink: http://spinnaker.domain.com
 
@@ -384,7 +384,7 @@ sapor:
       ##
       spinGateURL: http://spin-gate:8084
 
-      ## By default spinExternalGateURL is {{ .Values.spinnaker.ingressGate.protocol }}://{{ .Values.spinnaker.ingressGate.host}}
+      ## By default spinExternalGateURL is {{ .Values.global.spinGate.protocol }}://{{ .Values.global.spinGate.host }}
       ## If spinExternalGateURL is an external IP address instead of ingress, Set the external IP address of spin-gate, this is used to redirect to
       ## the spinnaker pipelines from OES-UI.
       ## Note: Trailing / is not required