[CORD-2909] Flatten and parameterize charts

Change-Id: I695c1df063b0f6f6ccf280254d54cc701292348f
diff --git a/xos-core/templates/core-service.yaml b/xos-core/templates/core-service.yaml
index d365e93..4e3a3b9 100644
--- a/xos-core/templates/core-service.yaml
+++ b/xos-core/templates/core-service.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +20,15 @@
   labels:
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
-  type: NodePort
-  ports:
-  - port: 50051
-    name: secure 
-    targetPort: 50051
-    nodePort: {{ .Values.node_ports.core_secure_service_port }}
-    protocol: TCP
-  - port: 50055
-    name: insecure 
-    targetPort: 50055
-    nodePort: {{ .Values.node_ports.core_insecure_service_port }}
-    protocol: TCP
+  type: ClusterIP
   selector:
     app: "xos-core"
+  ports:
+    - port: 50051
+      name: secure
+      targetPort: 50051
+      protocol: TCP
+    - port: 50055
+      name: insecure
+      targetPort: 50055
+      protocol: TCP