diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml index efd4fbd2..f527baa7 100644 --- a/charts/oes/Chart.yaml +++ b/charts/oes/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: oes -version: 4.0.14 +version: 4.0.15 appVersion: 4.0.4.2 description: "ISD and Spinnaker with v1.30.1 and Grafana Insights" icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png diff --git a/charts/oes/templates/configmaps/oes-ui-nginxconf.yaml b/charts/oes/templates/configmaps/oes-ui-nginxconf.yaml index e2427728..d38edee9 100644 --- a/charts/oes/templates/configmaps/oes-ui-nginxconf.yaml +++ b/charts/oes/templates/configmaps/oes-ui-nginxconf.yaml @@ -4,7 +4,7 @@ data: {{- if and (.Values.enableCentralMonitoring) (.Values.installSpinnaker) (not .Values.global.gitea.enabled) }} {{ (tpl (.Files.Glob "config/oes-ui/nginx-grafana.conf").AsConfig . ) | indent 2 }} {{- else }} -{{- if and (.Values.installSpinnaker) (not .Values.global.gitea.enabled) }} +{{- if (not .Values.global.gitea.enabled) }} {{ (tpl (.Files.Glob "config/oes-ui/nginx.conf").AsConfig . ) | indent 2 }} {{- else }} {{- if and (.Values.global.gitea.enabled) (.Values.installSpinnaker ) }}