roc-umbrella: releasing 2.1.33 for updated aether 2.1 model
Change-Id: I5af546b4a2bfea15cdeb9cd98614755fba34553c
diff --git a/aether-roc-umbrella/templates/_helpers.tpl b/aether-roc-umbrella/templates/_helpers.tpl
index 4f31a8b..2e936e8 100644
--- a/aether-roc-umbrella/templates/_helpers.tpl
+++ b/aether-roc-umbrella/templates/_helpers.tpl
@@ -78,4 +78,25 @@
{{- else -}}
{{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
{{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{/*
+sdcore-test-dummy
+*/}}
+{{- define "sdcore-test-dummy.fullname" -}}
+{{- printf "%s-sdcore-test-dummy" .Release.Name -}}
+{{- end -}}
+
+{{/*
+sdcore-adapter-v2-0-addr
+*/}}
+{{- define "sdcore-adapter-v2-0-addr" -}}
+{{- printf "%s-sdcore-adapter-v2-0:5150" .Release.Name -}}
+{{- end -}}
+
+{{/*
+sdcore-adapter-v2-1-addr
+*/}}
+{{- define "sdcore-adapter-v2-1-addr" -}}
+{{- printf "%s-sdcore-adapter-v2-1:5150" .Release.Name -}}
+{{- end -}}
diff --git a/aether-roc-umbrella/templates/datasources-templated.yaml b/aether-roc-umbrella/templates/datasources-templated.yaml
index 1f507d9..0e03116 100644
--- a/aether-roc-umbrella/templates/datasources-templated.yaml
+++ b/aether-roc-umbrella/templates/datasources-templated.yaml
@@ -15,7 +15,7 @@
datasources:
{{- range .Values.grafana.source }}
- name: datasource-{{ .name }}
- url: {{ .protocol }}://{{ .service }}:{{ .port }}
+ url: {{ .protocol }}://{{ tpl .service $ }}:{{ .port }}
type: prometheus
access: proxy
jsonData:
diff --git a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
index 9d9d109..b827ab6 100644
--- a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
+++ b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
@@ -5,7 +5,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ .Release.Name }}-sdcore-test-dummy
+ name: {{ template "sdcore-test-dummy.fullname" . }}
namespace: {{ .Release.Namespace }}
data:
sdcore-test-dummy.conf: |-
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index b9198e9..6dddb2e 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -31,7 +31,7 @@
name: aether
aspects:
onos.topo.Configurable:
- address: sdcore-adapter-v2-0:5150
+ address: {{ template "sdcore-adapter-v2-0-addr" $ }}
version: 2.0.x
type: aether
onos.topo.Location:
@@ -55,7 +55,7 @@
name: enterprise
aspects:
onos.topo.Configurable:
- address: sdcore-adapter-v2-1:5150
+ address: {{ template "sdcore-adapter-v2-1-addr" $ }}
version: 2.1.x
type: aether
onos.topo.Location: