roc-umbrella: releasing 2.1.33 for updated aether 2.1 model
Change-Id: I5af546b4a2bfea15cdeb9cd98614755fba34553c
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 890fcd2..76e43fd 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.1.32
+version: 2.1.33
appVersion: v0.0.0
keywords:
- aether
@@ -21,19 +21,19 @@
- name: onos-topo
condition: import.onos-topo.enabled
repository: https://charts.onosproject.org
- version: 1.4.1
+ version: 1.4.5
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
- version: 1.8.3
+ version: 1.8.5
- name: onos-cli
condition: import.onos-cli.enabled
repository: https://charts.onosproject.org
- version: 1.3.11
+ version: 1.3.13
- name: aether-roc-api
condition: import.aether-roc-api.enabled
repository: "file://../aether-roc-api"
- version: 1.7.13
+ version: 1.7.14
- name: aether-roc-gui-v2
condition: import.aether-roc-gui.v2-0.enabled
repository: https://charts.aetherproject.org
@@ -41,7 +41,7 @@
- name: aether-roc-gui
condition: import.aether-roc-gui.v2-1.enabled
repository: "file://../aether-roc-gui"
- version: 2.1.18
+ version: 2.1.19
alias: aether-roc-gui-v2-1
- name: sdcore-adapter-v2
condition: import.sdcore-adapter.v2-0.enabled
@@ -56,7 +56,7 @@
- name: sdcore-adapter
condition: import.sdcore-adapter.v2-1.enabled
repository: "file://../sdcore-adapter"
- version: 2.1.3
+ version: 2.1.4
alias: sdcore-adapter-v2-1
- name: subscriber-proxy
condition: import.subscriber-proxy.enabled
@@ -66,35 +66,35 @@
alias: sdcore-test-dummy
condition: import.sdcore-test-dummy.enabled
repository: https://charts.bitnami.com/bitnami
- version: 12.0.0
+ version: 13.2.0
- name: grafana
condition: import.grafana.enabled
repository: https://grafana.github.io/helm-charts
- version: 6.16.6
+ version: 6.49.0
- name: prometheus
condition: import.prometheus.amp.enabled
repository: https://prometheus-community.github.io/helm-charts
- version: 14.6.1
+ version: 19.3.0
alias: prometheus-amp
- name: prometheus
condition: import.prometheus.acc.enabled
repository: https://prometheus-community.github.io/helm-charts
- version: 14.6.1
+ version: 19.3.0
alias: prometheus-acc
- name: prometheus
condition: import.prometheus.ace.enabled
repository: https://prometheus-community.github.io/helm-charts
- version: 14.6.1
+ version: 19.3.0
alias: prometheus-ace
- name: prom-label-proxy
condition: import.prom-label-proxy.amp.enabled
repository: "file://../prom-label-proxy"
- version: 0.1.2
+ version: 0.1.3
alias: prom-label-proxy-amp
- name: prom-label-proxy
condition: import.prom-label-proxy.acc.enabled
repository: "file://../prom-label-proxy"
- version: 0.1.2
+ version: 0.1.3
alias: prom-label-proxy-acc
- name: aether-mock-exporter
condition: import.aether-mock-exporter.enabled
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:
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index a287b50..922387f 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -106,85 +106,73 @@
# Aether ROC GUI
aether-roc-gui-v2:
- nameOverride: aether-roc-gui-v2
- fullnameOverride: aether-roc-gui-v2
grafana:
proxyEnabled: true
- service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
+ service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
prometheus:
acc:
proxyEnabled: true
- service: prom-label-proxy-acc
+ service: "{{ .Release.Name }}-prom-label-proxy-acc"
protocol: http
port: 8080
amp:
proxyEnabled: true
- service: prom-label-proxy-amp
+ service: "{{ .Release.Name }}-prom-label-proxy-amp"
protocol: http
port: 8080
site:
- name: ace1
- service: aether-roc-umbrella-prometheus-ace-server
+ service: "{{ .Release.Name }}-prometheus-ace-server"
protocol: http
port: 80
aether-roc-gui-v2-1:
- nameOverride: aether-roc-gui-v2-1
- fullnameOverride: aether-roc-gui-v2-1
feature:
aether: true
sdnfabric: false
grafana:
proxyEnabled: true
- service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
+ service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
prometheus:
acc:
proxyEnabled: true
- service: prom-label-proxy-acc
+ service: "{{ .Release.Name }}-prom-label-proxy-acc"
protocol: http
port: 8080
amp:
proxyEnabled: true
- service: prom-label-proxy-amp
+ service: "{{ .Release.Name }}-prom-label-proxy-amp"
protocol: http
port: 8080
site:
- name: ace1
- service: aether-roc-umbrella-prometheus-ace-server
+ service: "{{ .Release.Name }}-prometheus-ace-server"
protocol: http
port: 80
# SD-Core Adapter
sdcore-adapter-v2-0:
- fullnameOverride: sdcore-adapter-v2-0
prometheusEnabled: false
partialUpdateEnabled: true
sdcore-adapter-v2-1:
- fullnameOverride: sdcore-adapter-v2-1
prometheusEnabled: false
partialUpdateEnabled: true
# Subscriber Proxy
subscriber-proxy:
- nameOverride: subscriber-proxy
- fullnameOverride: subscriber-proxy
prometheusEnabled: false
# Prom label Proxy
prom-label-proxy-amp:
- nameOverride: prom-label-proxy-amp
- fullnameOverride: prom-label-proxy-amp
prometheusEnabled: false
config:
- upstream: http://aether-roc-umbrella-prometheus-amp-server
+ upstream: "http://{{ .Release.Name }}-prometheus-amp-server"
prom-label-proxy-acc:
- nameOverride: prom-label-proxy-acc
- fullnameOverride: prom-label-proxy-acc
prometheusEnabled: false
config:
- upstream: http://aether-roc-umbrella-prometheus-acc-server
+ upstream: "http://{{ .Release.Name }}-prometheus-acc-server"
grafana:
sidecar:
@@ -199,23 +187,23 @@
source:
- name: acc
protocol: http
- service: aether-roc-umbrella-prometheus-acc-server
+ service: "{{ .Release.Name }}-prometheus-acc-server"
port: 80
- name: amp
protocol: http
- service: aether-roc-umbrella-prometheus-amp-server
+ service: "{{ .Release.Name }}-prometheus-amp-server"
port: 80
- name: acme-chicago
protocol: http
- service: aether-roc-umbrella-prometheus-ace-server
+ service: "{{ .Release.Name }}-prometheus-ace-server"
port: 80
- name: starbucks-newyork
protocol: http
- service: aether-roc-umbrella-prometheus-ace-server
+ service: "{{ .Release.Name }}-prometheus-ace-server"
port: 80
- name: starbucks-seattle
protocol: http
- service: aether-roc-umbrella-prometheus-ace-server
+ service: "{{ .Release.Name }}-prometheus-ace-server"
port: 80
grafana.ini:
log:
@@ -260,11 +248,11 @@
name: KeyCloak
prometheus-acc:
- pushgateway:
+ prometheus-pushgateway:
enabled: false
- nodeExporter:
+ prometheus-node-exporter:
enabled: false
- kubeStateMetrics:
+ kube-state-metrics:
enabled: false
alertmanager:
enabled: false
@@ -324,11 +312,11 @@
- aether-mock-exporter:2112
prometheus-amp:
- pushgateway:
+ prometheus-pushgateway:
enabled: false
- nodeExporter:
+ prometheus-node-exporter:
enabled: false
- kubeStateMetrics:
+ kube-state-metrics:
enabled: false
alertmanager:
enabled: false
@@ -342,11 +330,11 @@
- aether-mock-exporter:2112
prometheus-ace:
- pushgateway:
+ prometheus-pushgateway:
enabled: false
- nodeExporter:
+ prometheus-node-exporter:
enabled: false
- kubeStateMetrics:
+ kube-state-metrics:
enabled: true
alertmanager:
enabled: false
@@ -362,14 +350,14 @@
scrape_interval: 2s
static_configs:
- targets:
- - aether-roc-umbrella-kube-state-metrics:8080
+ - kube-state-metrics:8080
# SD-Core Test Dummy
# proxy_pass has to be added or nginx will not log the $request_body
sdcore-test-dummy:
service:
type: ClusterIP
- existingServerBlockConfigmap: aether-roc-umbrella-sdcore-test-dummy
+ existingServerBlockConfigmap: "{{ .Release.Name }}-sdcore-test-dummy"
# ONOS-CONFIG
onos-config:
@@ -383,13 +371,13 @@
endpoint: localhost
port: 5152
- name: aether-2-1
- image: onosproject/aether-2.1.x:2.1.11-aether-2.1.x
+ image: onosproject/aether-2.1.x:2.1.14-aether-2.1.x
endpoint: localhost
port: 5153
openpolicyagent:
- enabled: true
- regoConfigMap: aether-roc-umbrella-opa-rbac
+ enabled: false
+ regoConfigMap: opa-rbac
enterprises:
- id: starbucks