Task Details:
=============
Task ID : AETHER-2167 : Implement helm charts for deploying prom-label-proxy
Task Link : https://jira.opennetworking.org/browse/AETHER-2167
Features/Root Cause Analysis :
==============================
* config model helm chart for prom label proxy
* prom-label-proxy helm chart
* getting initial config not done deliberatlywq
Unit Test:
=============
* Integration testing with prometheus done
* Integration testing with Grafana pending
Change-Id: I1b94feee56cb7046dd1affb036c3d02585aedcaf
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index b425230..ba9743f 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 1.4.16
+version: 1.4.17
appVersion: v0.0.0
keywords:
- aether
@@ -29,6 +29,11 @@
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
version: 4.0.8
+ - name: config-model-plproxy
+ condition: onos-config.models.plproxy.v1.enabled
+ repository: "file://../config-models/plproxy-1.x"
+ version: 1.0.0
+ alias: config-model-plproxy-1-0-0
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
@@ -82,3 +87,8 @@
condition: import.prometheus.enabled
repository: https://prometheus-community.github.io/helm-charts
version: 14.6.1
+ - name: prom-label-proxy
+ condition: import.plproxy.enabled
+ repository: "file://../prom-label-proxy"
+ version: 0.3.3
+ alias: prom-label-proxy-v1
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 45cd770..fa4e00c 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -76,3 +76,34 @@
onos.topo.Asset:
name: 5G Core
onos.topo.MastershipState: {}
+
+---
+apiVersion: topo.onosproject.org/v1beta1
+kind: Kind
+metadata:
+ name: plproxy
+spec:
+ aspects: {}
+
+---
+# Prom-label-proxy
+apiVersion: topo.onosproject.org/v1beta1
+kind: Entity
+metadata:
+ name: plproxy-service-v1
+spec:
+ uri: plproxy-service-v1
+ kind:
+ name: plproxy
+ aspects:
+ onos.topo.Configurable:
+ address: prom-label-proxy-v1:5150
+ version: 1.0.0
+ type: PLProxy
+ onos.topo.TLSOptions:
+ insecure: true
+ onos.topo.Asset:
+ name: Prom Label Proxy
+ onos.topo.MastershipState: {}
+
+
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 9960045..2a4afcc 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -57,6 +57,8 @@
enabled: true
sdcore-test-dummy:
enabled: true
+ plproxy:
+ enabled: true
grafana:
enabled: true #also enable the proxy below
prometheus:
@@ -113,6 +115,12 @@
fullnameOverride: subscriber-proxy
prometheusEnabled: false
+# Prom label Proxy
+prom-label-proxy:
+ nameOverride: prom-label-proxy-v1
+ fullnameOverride: prom-label-proxy-v1
+ prometheusEnabled: false
+
grafana:
orgs:
acme:
@@ -251,6 +259,9 @@
enabled: true
v4:
enabled: true
+ plproxy:
+ v1:
+ enabled: true
plugin:
compiler:
target: ""