Merge pull request #569 from keerthibingi/v4.0.4.2

Updating condition in oes-ui-nginxconf.yaml and releasing 4.0.15 chart version
OpsMx · Mar 29, 2024 · 46b9e29 · 46b9e29
2 parents d54d062 + 6c01bb7
commit 46b9e29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 ) }}