Move onos-voltha out of the voltha namespace
Change-Id: I7121373ee11387d242525445d47025f90b97353c
diff --git a/configs/onos-voltha.yaml b/configs/onos-voltha.yaml
index 3f7b95c..278439f 100644
--- a/configs/onos-voltha.yaml
+++ b/configs/onos-voltha.yaml
@@ -21,9 +21,6 @@
nameOverride: "onosv"
fullnameOverride: "onos-voltha"
-namespace: voltha
-serviceAccountName: voltha-serviceaccount
-
onosImage: 'voltha/voltha-onos:latest'
services:
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 0038b27..f91cf16 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -95,7 +95,7 @@
- "/ofagent/ofagent/main.py"
- "-v"
- "--consul=consul.$(NAMESPACE).svc.cluster.local:8500"
-- "--controller=onos-voltha-openflow:6653"
+- "--controller=onos-voltha-openflow.default.svc.cluster.local:6653"
- "--grpc-endpoint=vcore.$(NAMESPACE).svc.cluster.local:50556"
- "--enable-tls"
- "--key-file=/ofagent/pki/voltha.key"
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 6f83977..9a1e7dd 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -33,7 +33,7 @@
vtnAppURL: "https://oss.sonatype.org/service/local/repositories/releases/content/org/opencord/vtn/1.6.0/vtn-1.6.0.oar"
onosCordRestService: "onos-cord-ui.default.svc.cluster.local"
-onosVolthaRestService: "onos-voltha-ui.voltha.svc.cluster.local"
+onosVolthaRestService: "onos-voltha-ui.default.svc.cluster.local"
onosFabricRestService: "onos-fabric-ui.default.svc.cluster.local"
kafkaService: "cord-kafka.default.svc.cluster.local:9092"