roc-umbrella: releasing 2.1.33 for updated aether 2.1 model
Change-Id: I5af546b4a2bfea15cdeb9cd98614755fba34553c
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index 28977b6..26fc14c 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,8 +7,8 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 2.1.18
-appVersion: v0.9.25
+version: 2.1.19
+appVersion: v0.10.1
keywords:
- aether
- roc
diff --git a/aether-roc-gui/templates/configmap.yaml b/aether-roc-gui/templates/configmap.yaml
index 4fdb450..99075d2 100644
--- a/aether-roc-gui/templates/configmap.yaml
+++ b/aether-roc-gui/templates/configmap.yaml
@@ -18,7 +18,7 @@
ssl_certificate_key /usr/share/certs/aether-roc-gui.key;
{{- if .Values.grafana.proxyEnabled }}
location /grafana/ {
- proxy_pass {{ .Values.grafana.protocol }}://{{ .Values.grafana.service }}:{{ .Values.grafana.port }}/;
+ proxy_pass {{ .Values.grafana.protocol }}://{{tpl (.Values.grafana.service | default .Values.grafana.service) . }}:{{ .Values.grafana.port }}/;
proxy_http_version 1.1;
proxy_redirect off;
proxy_set_header Upgrade $http_upgrade;
@@ -32,21 +32,21 @@
}{{end}}
{{- if .Values.prometheus.acc.proxyEnabled }}
location /prometheus-acc/ {
- proxy_pass {{ .Values.prometheus.acc.protocol }}://{{ .Values.prometheus.acc.service }}:{{ .Values.prometheus.acc.port }}/;
+ proxy_pass {{ .Values.prometheus.acc.protocol }}://{{tpl (.Values.prometheus.acc.service | default .Values.prometheus.acc.service) . }}:{{ .Values.prometheus.acc.port }}/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
add_header X-Frame-Options SAMEORIGIN;
}{{end}}
{{- if .Values.prometheus.amp.proxyEnabled }}
location /prometheus-amp/ {
- proxy_pass {{ .Values.prometheus.amp.protocol }}://{{ .Values.prometheus.amp.service }}:{{ .Values.prometheus.amp.port }}/;
+ proxy_pass {{ .Values.prometheus.amp.protocol }}://{{tpl (.Values.prometheus.amp.service | default .Values.prometheus.amp.service) . }}:{{ .Values.prometheus.amp.port }}/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
add_header X-Frame-Options SAMEORIGIN;
}{{end}}
{{- range $siteid, $site := .Values.prometheus.site }}
location /prometheus-{{$site.name}}/ {
- proxy_pass {{ $site.protocol }}://{{ $site.service }}:{{ $site.port }}/;
+ proxy_pass {{ $site.protocol }}://{{ tpl $site.service $ }}:{{ $site.port }}/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
add_header X-Frame-Options SAMEORIGIN;
@@ -63,7 +63,7 @@
}
{{- range $key, $value := .Values.aetherservices }}
location /{{ $key }}/ {
- proxy_pass {{ $value.protocol}}://{{$key}}:{{ $value.http }}/;
+ proxy_pass {{ $value.protocol}}://{{ tpl $value.service $ }}:{{ $value.http }}/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index a052116..7d59f9b 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -15,8 +15,6 @@
pullSecrets: []
imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: "aether-roc-gui-v2-1"
## Client service.
service:
@@ -64,6 +62,7 @@
aetherservices:
aether-roc-api:
+ service: "{{ .Release.Name }}-aether-roc-api"
http: 8181
protocol: http
streamTimeout: 3600