[CORD-2909] Flatten and parameterize charts

Change-Id: I695c1df063b0f6f6ccf280254d54cc701292348f
diff --git a/xos-core/templates/ws-deployment.yaml b/xos-core/templates/ws-deployment.yaml
index 0710c11..5f4cad4 100644
--- a/xos-core/templates/ws-deployment.yaml
+++ b/xos-core/templates/ws-deployment.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +18,7 @@
 metadata:
   name: xos-ws
   labels:
-    app: xos-ws
+    {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
   template:
@@ -27,9 +28,9 @@
     spec:
       containers:
         - name: xos-ws
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_ws.repository }}:{{ .Values.images.xos_ws.tag }}
-          imagePullPolicy: {{ .Values.images.xos_ws.pullPolicy }}
-          command: ["npm", "start", "--",  "--config", "gateway-config.yml"]
+          image: {{ .Values.xos_wsImage | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          command: ["npm", "start", "--", "--config", "gateway-config.yml"]
           ports:
             - containerPort: 3000
               port: 3000
@@ -41,7 +42,7 @@
       volumes:
         - name: gateway-config
           configMap:
-            name: xos-gateway
+            name: xos-ws
             items:
-             - key: config
-               path: config/gateway-config.yml
\ No newline at end of file
+              - key: config
+                path: config/gateway-config.yml