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

Change-Id: I2e8ef8d38a45bb3f90708b7ced7f0ae06e8dbc4f
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 9915686..a1027d7 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -24,6 +24,9 @@
     chart: {{ template "onos.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.xos_service_label }}
+    xos_service: {{ .Values.xos_service_label }}
+{{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -35,6 +38,9 @@
       labels:
         app: {{ template "onos.name" . }}
         release: {{ .Release.Name }}
+{{- if .Values.xos_service_label }}
+        xos_service: {{ .Values.xos_service_label }}
+{{- end }}
     spec:
       serviceAccount: {{ .Values.serviceAccountName }}
       serviceAccountName: {{ .Values.serviceAccountName }}