clean up kpm related tags in sd-ran chart (#534)

onosproject · Jun 11, 2021 · a4f8f36 · a4f8f36
1 parent e8fde8c
commit a4f8f36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/sd-ran/Chart.yaml b/sd-ran/Chart.yaml
@@ -7,7 +7,7 @@ name: sd-ran
 description: Umbrella chart to deploy all ONOS-RIC and simulator
 kubeVersion: ">=1.17.0"
 type: application
-version: 1.1.33
+version: 1.1.34
 appVersion: v1.1.2
 keywords:
  - onos
@@ -64,15 +64,9 @@ dependencies:
  repository: https://charts.onosproject.org
  version: 1.0.13
  - name: onos-kpimon
- condition: import.onos-kpimon-v1.enabled
+ condition: import.onos-kpimon.enabled
  repository: "@sdran"
  version: 0.6.8
- alias: onos-kpimon-v1
- - name: onos-kpimon
- condition: import.onos-kpimon-v2.enabled
- repository: "@sdran"
- version: 0.6.8
- alias: onos-kpimon-v2
  - name: onos-pci
  condition: import.onos-pci.enabled
  repository: "@sdran"

diff --git a/sd-ran/values.yaml b/sd-ran/values.yaml
@@ -62,9 +62,7 @@ import:
  enabled: false
  nem-monitoring:
  enabled: false
- onos-kpimon-v1:
- enabled: false
- onos-kpimon-v2:
+ onos-kpimon:
  enabled: false
  onos-pci:
  enabled: false
@@ -210,17 +208,6 @@ onos-cli:
  toponew: berlin-honeycomb-4-3-toponew.yaml
  config: [ berlin-honeycomb-4-3-gnmi.yaml ]
 
-onos-kpimon-v1:
- fullnameOverride: "onos-kpimon-v1"
- config:
- kpimon:
- kpmVersion: v1
-
-onos-kpimon-v2:
- fullnameOverride: "onos-kpimon-v2"
- config:
- kpimon:
- kpmVersion: v2
 
 onos-exporter:
  config: