commit aefb9270c478da6401f2ea31636f9fce6956b7ab
author Scott Baker <smbaker@gmail.com> Mon Apr 18 09:47:47 2022 -0700
committer Scott Baker <smbaker@gmail.com> Mon Apr 18 12:46:15 2022 -0700
tree 8150eabc0aee341f39b2abe64e8a0b560b492061
parent e155baf0ba1ba88a20acea7a18bcc741d8765656

AETHER-3427 helm chart for sdcore-adapter v2.1

Change-Id: Iae3bb900cd888700dfd785cd142d78054e36a617

aether-roc-umbrella/Chart.yaml

diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index bad32a5..7903f72 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: 2.1.7
+version: 2.1.8
 appVersion: v0.0.0
 keywords:
   - aether
@@ -49,10 +49,10 @@
     condition: import.sdcore-adapter.v2.enabled
     repository: "file://../sdcore-adapter-v2"
     version: 2.1.1
-  - name: sdcore-adapter-v4
-    condition: import.sdcore-adapter.v4.enabled
-    repository: "file://../sdcore-adapter-v4"
-    version: 4.0.19
+  - name: sdcore-adapter-v2-1
+    condition: import.sdcore-adapter.v2-1.enabled
+    repository: "file://../sdcore-adapter-v2-1"
+    version: 2.1.1
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
     repository: "file://../subscriber-proxy"

aether-roc-umbrella/README.md

diff --git a/aether-roc-umbrella/README.md b/aether-roc-umbrella/README.md
index 19ef73f..81e5a80 100644
--- a/aether-roc-umbrella/README.md
+++ b/aether-roc-umbrella/README.md
@@ -36,8 +36,17 @@
 The Aether ROC Umbrella chart controls the Config Model Plugins that are enabled in `onos-config`
 Currently 2 versions of the `Aether` model are loaded:
 
-* aether-2.1.0
-* aether-3.0.0
+* aether-2.0.x
+* aether-2.1.x
+
+## Configuring a default target
+For the 2.1.x models, you may need to set a default target when configuring sdcore-adapter, as onos-config
+does not supply the target at this time. Override the setting "defaultTarget". For example,
+
+```yaml
+sdcore-adapter-v2-1:
+  defaultTarget: acme
+```
 
 ## Deploy with Authentication enabled
 

aether-roc-umbrella/values.yaml

diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 9831f84..9839918 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -48,9 +48,9 @@
       enabled: false
   sdcore-adapter:
     v2:
-      enabled: true
-    v4:
       enabled: false
+    v2-1:
+      enabled: true
   subscriber-proxy:
     enabled: true
   sdcore-test-dummy:
@@ -143,9 +143,9 @@
   prometheusEnabled: false
   partialUpdateEnabled: true
 
-sdcore-adapter-v4:
+sdcore-adapter-v2-1:
   prometheusEnabled: false
-  partialUpdateEnabled: true
+  partialUpdateEnabled: true  
 
 # Subscriber Proxy
 subscriber-proxy: