using atomix-runtime for latest
Change-Id: I200d6f036c80d1b81042bf1cb889f3f9521c55dc
diff --git a/Makefile b/Makefile
index fe90d34..a0243a9 100644
--- a/Makefile
+++ b/Makefile
@@ -442,16 +442,24 @@
kubectl get namespace aether-roc 2> /dev/null || kubectl create namespace aether-roc
helm repo update
if [ "$(CHARTS)" == "local" ]; then helm dep up $(AETHER_ROC_UMBRELLA_CHART); fi
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace kube-system \
- --values $(ROC_VALUES) \
- atomix-controller \
- $(ATOMIX_CONTROLLER_CHART)
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace kube-system \
- --values $(ROC_VALUES) \
- atomix-raft-storage \
- $(ATOMIX_RAFT_STORAGE_CHART)
+ if [ "$(CHARTS)" == "release-2.0" -o "$(CHARTS)" == "release-1.6" ]; then \
+ helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
+ --namespace kube-system \
+ --values $(ROC_VALUES) \
+ atomix-controller \
+ $(ATOMIX_CONTROLLER_CHART); \
+ helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
+ --namespace kube-system \
+ --values $(ROC_VALUES) \
+ atomix-raft-storage \
+ $(ATOMIX_RAFT_STORAGE_CHART); \
+ else \
+ helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
+ --namespace kube-system \
+ --values $(ROC_VALUES) \
+ atomix-runtime \
+ $(ATOMIX_RUNTIME_CHART); \
+ fi
helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
--namespace kube-system \
--values $(ROC_VALUES) \
diff --git a/configs/latest b/configs/latest
index 2af5cc6..8cad3d0 100644
--- a/configs/latest
+++ b/configs/latest
@@ -8,6 +8,7 @@
AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella
ATOMIX_CONTROLLER_CHART := atomix/atomix-controller
ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
+ATOMIX_RUNTIME_CHART := atomix/atomix-runtime
ONOS_OPERATOR_CHART := onosproject/onos-operator
# For installing the applications
diff --git a/configs/local b/configs/local
index b4f1363..69fd664 100644
--- a/configs/local
+++ b/configs/local
@@ -10,7 +10,6 @@
# Support testing aether-roc-umbrella chart
AETHER_ROC_UMBRELLA_CHART := $(WORKSPACE)/cord/roc-helm-charts/aether-roc-umbrella
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
+ATOMIX_RUNTIME_CHART := atomix/atomix-runtime
ONOS_OPERATOR_CHART := onosproject/onos-operator
diff --git a/configs/local-sdcore b/configs/local-sdcore
index 8a65827..66d7f92 100644
--- a/configs/local-sdcore
+++ b/configs/local-sdcore
@@ -8,6 +8,5 @@
# Support testing aether-roc-umbrella chart
AETHER_ROC_UMBRELLA_CHART := $(WORKSPACE)/cord/roc-helm-charts/aether-roc-umbrella
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
+ATOMIX_RUNTIME_CHART := atomix/atomix-runtime
ONOS_OPERATOR_CHART := onosproject/onos-operator
diff --git a/roc-values.yaml b/roc-values.yaml
index ce724ff..88d91e5 100644
--- a/roc-values.yaml
+++ b/roc-values.yaml
@@ -3,14 +3,15 @@
# SPDX-License-Identifier: Apache-2.0
global:
- storage:
- controller: "atomix-controller.kube-system:5679"
- store:
- consensus:
- enabled: true
- clusters: 1
- replicas: 1
- partitions: 1
+ atomix:
+ storage:
+ controller: "atomix-controller.kube-system:5679"
+ store:
+ consensus:
+ enabled: true
+ clusters: 1
+ replicas: 3
+ partitions: 30
import:
aether-roc-gui:
@@ -42,12 +43,6 @@
subscriber-proxy:
enabled: false
-onos-gui:
- ingress:
- enabled: false
- service:
- type: NodePort
-
aether-roc-gui-v2-1:
ingress:
enabled: false