SEBA-169 Split config for kubernetes service;
add labels for onos containers;
move container image version to master

Change-Id: I2e8ef8d38a45bb3f90708b7ced7f0ae06e8dbc4f
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index b09a459..5c4a96a 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -46,8 +46,8 @@
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
             - name: kubernetes-config
-              mountPath: /opt/xos/synchronizers/kubernetes/kubernetes_config.yaml
-              subPath: kubernetes_config.yaml
+              mountPath: /opt/xos/synchronizers/kubernetes/mounted_config.yaml
+              subPath: mounted_config.yaml
             - name: certchain-volume
               mountPath: /usr/local/share/ca-certificates/local_certs.crt
               subPath: config/ca_cert_chain.pem
@@ -57,7 +57,7 @@
             name: kubernetes
             items:
               - key: serviceConfig
-                path: kubernetes_config.yaml
+                path: mounted_config.yaml
         - name: certchain-volume
           configMap:
             name: ca-certificates