[VOL-3779] Referring to upstream charts and updating documentation
Change-Id: Id7f0e1716398903d33188c495f0ca2349f211fd7
diff --git a/README.md b/README.md
index a690e32..ad2d192 100644
--- a/README.md
+++ b/README.md
@@ -25,21 +25,12 @@
### Prerequisites
To use the charts for VOLTHA the following Helm repositories should be
added to your helm environment:
+
```shell
helm repo add onf https://charts.opencord.org
helm repo update
```
-#### Temporary steps before the patch is merged
-
-These are a set of steps required to bring up the environment before this patch is merged and the charts are published
-```
-helm repo add kokuwa https://kokuwaio.github.io/helm-charts
-helm repo add elastic https://helm.elastic.co
-helm dep update voltha-infra
-helm dep update voltha-stack
-```
-
#### Load the kubernetes config in the cluster
*This is only required if you will deploy `bbsim-sadis-server`*
@@ -55,14 +46,14 @@
can be installed via the `voltha-infra` helm chart:
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra
+helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra
```
By default the `voltha-infra` helm chart will install one instance of each component,
but that can be customized via a custom value file or via flags, eg:
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra \
+helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra \
--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 \
--set kafka.replicaCount=3,kafka.zookeeper.replicaCount=3 \
--set etcd.statefulset.replicaCount=3
@@ -99,7 +90,7 @@
necessary to create a custom value file with your content and install the chart with:
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra -f myfile.yaml
+helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra -f myfile.yaml
```
#### Support for logging and tracing (optional)
@@ -109,7 +100,7 @@
the VOLTHA infrastructure:
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra \
+helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra \
--set voltha-tracing.enabled=true \
--set efk.enabled=true
```
@@ -137,7 +128,7 @@
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra
@@ -148,7 +139,7 @@
>
> ```
> helm upgrade --install --create-namespace \
-> -n voltha2 voltha2 voltha-stack \
+> -n voltha2 voltha2 onf/voltha-stack \
> --set global.stack_name=voltha2 \
> --set voltha_infra_name=voltha-infra \
> --set voltha_infra_namespace=infra
@@ -160,7 +151,7 @@
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra \
@@ -175,20 +166,20 @@
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra \
--set global.log_correlation.enabled=true
```
-## Use the OpenONU python adapter
+### Use the OpenONU python adapter
> NOTE that this adapter is now unsupported, so you're in uncharted territory from now on.
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra \
@@ -248,17 +239,17 @@
**DT**
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra -f examples/dt-values.yaml
+helm upgrade --install -n infra voltha-infra onf/voltha-infra -f examples/dt-values.yaml
helm upgrade --install -n voltha1 bbsim0 onf/bbsim --set olt_id=10 -f examples/dt-values.yaml
-helm upgrade --install --create-namespace -n voltha1 voltha1 voltha-stack --set global.stack_name=voltha1 --set voltha_infra_name=voltha-infra --set voltha_infra_namespace=infra
+helm upgrade --install --create-namespace -n voltha1 voltha1 onf/voltha-stack --set global.stack_name=voltha1 --set voltha_infra_name=voltha-infra --set voltha_infra_namespace=infra
```
**TT**
```shell
-helm upgrade --install -n infra voltha-infra voltha-infra -f examples/tt-values.yaml
+helm upgrade --install -n infra voltha-infra onf/voltha-infra -f examples/tt-values.yaml
helm upgrade --install -n voltha1 bbsim0 onf/bbsim --set olt_id=10 -f examples/tt-values.yaml
-helm upgrade --install --create-namespace -n voltha1 voltha1 voltha-stack --set global.stack_name=voltha1 --set voltha_infra_name=voltha-infra --set voltha_infra_namespace=infra
+helm upgrade --install --create-namespace -n voltha1 voltha1 onf/voltha-stack --set global.stack_name=voltha1 --set voltha_infra_name=voltha-infra --set voltha_infra_namespace=infra
```
## Post installation
@@ -378,7 +369,7 @@
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra \
@@ -402,7 +393,7 @@
```shell
helm upgrade --install --create-namespace \
- -n voltha1 voltha1 voltha-stack \
+ -n voltha1 voltha1 onf/voltha-stack \
--set global.stack_name=voltha1 \
--set voltha_infra_name=voltha-infra \
--set voltha_infra_namespace=infra \
diff --git a/examples/att-values.yaml b/examples/att-values.yaml
new file mode 100644
index 0000000..519359e
--- /dev/null
+++ b/examples/att-values.yaml
@@ -0,0 +1,19 @@
+---
+
+# Copyright 2020-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# ATT values are the defaults, nothing to override here.
+# This file is only useful so that during CI we can always invoke `helm install`
+# with `-f examples/${workflow}-values.yaml`
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index 1354d94..9a1e5aa 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,7 +29,7 @@
name: voltha-infra
appVersion: "1.0"
-version: 0.1.0
+version: 0.1.1
dependencies:
- name: onos-classic
@@ -37,8 +37,7 @@
version: 0.1.10
condition: onos-classic.enabled
- name: bbsim-sadis-server
- # repository: https://charts.opencord.org
- repository: "file://../bbsim-sadis-server"
+ repository: https://charts.opencord.org
version: 0.1.1
condition: bbsim-sadis-server.enabled
- name: etcd
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index ac6e8e5..4ded737 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,21 +28,18 @@
name: voltha-stack
appVersion: "1.0"
-version: 0.1.1
+version: 0.1.2
dependencies:
- name: voltha
- # repository: https://charts.opencord.org
+ repository: https://charts.opencord.org
version: 2.8.1
- repository: "file://../voltha"
condition: voltha.enabled
- name: voltha-adapter-openonu
- # repository: https://charts.opencord.org
+ repository: https://charts.opencord.org
version: 2.7.3
- repository: "file://../voltha-adapter-openonu"
condition: voltha-adapter-openonu.enabled
- name: voltha-adapter-openolt
- # repository: https://charts.opencord.org
+ repository: https://charts.opencord.org
version: 2.8.1
- repository: "file://../voltha-adapter-openolt"
condition: voltha-adapter-openolt.enabled