making the AETHER-2304 changes for the aether-1.5 branch
also updating with latest aether-roc-api and aether-roc-gui from aether-1.5 branch
Change-Id: I27fd8c5389536747279d910dc05ae97889b07350
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index c426ff3..78ee9a9 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,8 +7,8 @@
description: Aether ROC API
kubeVersion: ">=1.15.0"
type: application
-version: 1.1.14
-appVersion: v0.7.14
+version: 1.1.150
+appVersion: v0.8.2
keywords:
- aether
- config
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index 5f4f9d7..5250273 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -10,7 +10,7 @@
image:
repository: onosproject/aether-roc-api
- tag: v0.7.14
+ tag: v0.8.2
pullPolicy: IfNotPresent
pullSecrets: []
websocketsidecar:
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index 494e994..77e7a55 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 3.0.24
+version: 3.0.150
appVersion: 3.0.0
keywords:
- aether
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index 0b9dc91..4465786 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -10,7 +10,7 @@
image:
repository: onosproject/aether-roc-gui
- tag: v0.7.24
+ tag: v0.7.26
pullPolicy: IfNotPresent
pullSecrets: []
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index c8d78b0..ccf360e 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.3.10
+version: 1.3.11
appVersion: v0.0.0
keywords:
- aether
@@ -21,20 +21,14 @@
condition: import.onos-topo.enabled
repository: https://charts.onosproject.org
version: 1.1.102
- - name: config-model-aether
- condition: onos-config.models.aether.v2_1.enabled
- repository: "@aether"
- version: 2.1.3
- alias: config-model-aether-2-1-0
- - name: config-model-aether
+ - name: config-model-aether-3
condition: onos-config.models.aether.v3.enabled
- repository: "@aether"
- version: 3.0.13
- alias: config-model-aether-3-0-0
+ repository: "file://../config-models/aether-3.x"
+ version: 3.0.150
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
- version: 1.3.4
+ version: 1.3.5
- name: onos-gui
condition: import.onos-gui.enabled
repository: https://charts.onosproject.org
@@ -45,21 +39,19 @@
version: 1.1.5
- name: aether-roc-api
condition: import.aether-roc-api.enabled
- repository: "@aether"
- version: 1.1.14
+ repository: "file://../aether-roc-api"
+ version: 1.1.150
- name: aether-roc-gui
condition: import.aether-roc-gui.v3.enabled
- repository: "@aether"
- version: 3.0.24
- alias: aether-roc-gui-v3
+ repository: "file://../aether-roc-gui"
+ version: 3.0.150
- name: sdcore-adapter
condition: import.sdcore-adapter.v3.enabled
- repository: "@aether"
+ repository: "file://../sdcore-adapter"
version: 3.0.15
- alias: sdcore-adapter-v3
- name: subscriber-proxy
condition: import.subscriber-proxy.enabled
- repository: "@aether"
+ repository: "file://../subscriber-proxy"
version: 0.0.3
- name: nginx
alias: sdcore-test-dummy
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index bcd17fc..7e77703 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -47,8 +47,6 @@
v3:
enabled: true
sdcore-adapter:
- v2_1:
- enabled: true
v3:
enabled: true
subscriber-proxy:
@@ -76,7 +74,7 @@
aether-roc-api: {}
# Aether ROC GUI
-aether-roc-gui-v3:
+aether-roc-gui:
websocket:
proxyEnabled: true
grafana:
@@ -86,19 +84,13 @@
proxyEnabled: true
service: aether-roc-umbrella-prometheus-server
-# SD-Core Adapter
-sdcore-adapter-v21:
- nameOverride: sdcore-adapter-v21
- fullnameOverride: sdcore-adapter-v21
- prometheusEnabled: false
-
# Subscriber Proxy
subscriber-proxy:
nameOverride: subscriber-proxy
fullnameOverride: subscriber-proxy
prometheusEnabled: false
-sdcore-adapter-v3:
+sdcore-adapter:
nameOverride: sdcore-adapter-v3
fullnameOverride: sdcore-adapter-v3
prometheusEnabled: false
diff --git a/config-models/aether-3.x/Chart.yaml b/config-models/aether-3.x/Chart.yaml
index 79c5a63..5086a06 100644
--- a/config-models/aether-3.x/Chart.yaml
+++ b/config-models/aether-3.x/Chart.yaml
@@ -3,8 +3,8 @@
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
apiVersion: v2
-name: config-model-aether
-version: 3.0.13
+name: config-model-aether-3
+version: 3.0.150
kubeVersion: ">=1.18.0"
appVersion: 3.0.0
description: Aether config model