Merge "ONOS with new patches"
diff --git a/kubernetes-configs/bbsim-voltha-master.yml b/kubernetes-configs/bbsim-voltha-master.yml
index 9adaa04..9fe1bc5 100644
--- a/kubernetes-configs/bbsim-voltha-master.yml
+++ b/kubernetes-configs/bbsim-voltha-master.yml
@@ -23,13 +23,22 @@
# in xos-core chart and other charts with multiple images
images:
+ xos_core:
+ tag: 'master'
+ xos_chameleon:
+ tag: 'master'
xos_tosca:
- tag: '1.3.1'
+ tag: 'master'
+ xos_api_tester:
+ tag: 'master'
+ tosca_loader:
+ tag: 'master'
# ONOS
onos:
- repository: 'matteoscandolo/onos'
- tag: '1.13.9-rc4'
+ repository: 'onosproject/onos'
+ tag: 'latest'
+ pullPolicy: 'Never'
# VOLTHA
vcore:
@@ -59,26 +68,26 @@
xos-gui:
images:
xos_gui:
- tag: '1.0.5'
+ tag: 'master'
xos_ws:
- tag: '2.0.2'
+ tag: 'master'
# in seba service chart
fabric:
image:
- tag: '2.2.1'
+ tag: 'master'
fabric-crossconnect:
image:
- tag: '1.2.1'
+ tag: 'master'
onos-service:
image:
- tag: '2.1.1'
+ tag: 'master'
sadis-server:
image:
tag: 'latest'
-olt-service:
+volt:
image:
- tag: '2.2.1'
+ tag: 'master'
rcord:
image:
tag: 'master'
@@ -86,12 +95,12 @@
# in base-kubernetes chart
kubernetes:
image:
- tag: '1.2.1'
+ tag: 'master'
# in workflow/att-workflow service chart
att-workflow-driver:
image:
- tag: '1.2.2'
+ tag: 'master'
# this is mandatory, it's needed to correctly configure the kafka endpoint
kafkaService: cord-kafka
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 9978822..7e29ffa 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -32,7 +32,8 @@
tag: 'master'
# ONOS
onos:
- tag: '1.13.9-rc4'
+ repository: 'matteoscandolo/onos'
+ tag: '1.13-branch'
# VOLTHA
vcore:
tag: 'voltha-1.7'