AETHER-3435 remove old sdcore-adapter chart
Change-Id: Iaa63f3a328803d63180bcd1ea00aa582fda9022b
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 7903f72..1d505a5 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.8
+version: 2.1.9
appVersion: v0.0.0
keywords:
- aether
@@ -46,13 +46,15 @@
repository: "file://../aether-roc-gui-v2"
version: 2.1.3
- name: sdcore-adapter-v2
- condition: import.sdcore-adapter.v2.enabled
- repository: "file://../sdcore-adapter-v2"
+ condition: import.sdcore-adapter.v2-0.enabled
+ repository: https://charts.aetherproject.org
version: 2.1.1
- - name: sdcore-adapter-v2-1
+ alias: sdcore-adapter-v2-0
+ - name: sdcore-adapter
condition: import.sdcore-adapter.v2-1.enabled
- repository: "file://../sdcore-adapter-v2-1"
- version: 2.1.1
+ repository: "file://../sdcore-adapter"
+ version: 2.1.2
+ alias: sdcore-adapter-v2-1
- name: subscriber-proxy
condition: import.subscriber-proxy.enabled
repository: "file://../subscriber-proxy"
diff --git a/aether-roc-umbrella/README.md b/aether-roc-umbrella/README.md
index 81e5a80..e4f90ea 100644
--- a/aether-roc-umbrella/README.md
+++ b/aether-roc-umbrella/README.md
@@ -41,13 +41,18 @@
## 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,
+does not supply the target at this time. Override the setting "defaultTarget". Likely candidates include
+`defaultent` which should be available in all deployments, or `acme` or `starbucks` which are present
+in the 2.1 aether-roc-api mega-patch. For example,
```yaml
sdcore-adapter-v2-1:
- defaultTarget: acme
+ defaultTarget: defaultent
```
+This setting is intentionally left unconfigured by default, to encourage the developer to choose a default
+target that matches their environment and workflow.
+
## Deploy with Authentication enabled
1) install the helm Repo https://cetic.github.io/helm-charts
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 2a187c7..faeb0b9 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -22,7 +22,7 @@
name: aether
aspects:
onos.topo.Configurable:
- address: sdcore-adapter-v2:5150
+ address: sdcore-adapter-v2-0:5150
version: 2.0.x
type: aether
onos.topo.Location:
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 9839918..f5bc379 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -47,7 +47,7 @@
v4:
enabled: false
sdcore-adapter:
- v2:
+ v2-0:
enabled: false
v2-1:
enabled: true
@@ -139,11 +139,13 @@
port: 80
# SD-Core Adapter
-sdcore-adapter-v2:
+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