Helm Chart Standardization of uui

[oom.git] / kubernetes / uui / charts / uui-server / templates / service.yaml

diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/charts/uui-server/templates/service.yaml
similarity index 54%
rename from kubernetes/uui/templates/all-services.yaml
rename to kubernetes/uui/charts/uui-server/templates/service.yaml
index 7f450cd..4570c99 100644 (file)
--- a/kubernetes/uui/templates/all-services.yaml
+++ b/kubernetes/uui/charts/uui-server/templates/service.yaml
@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#{{ if not .Values.disableUuiUui }}
 apiVersion: v1
 kind: Service
 metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
   labels:
-    app: uui
-  name: uui
-  namespace: "{{ .Values.nsPrefix }}"
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
   annotations:
     msb.onap.org/service-info: '[
       {
@@ -33,40 +35,17 @@ metadata:
       }
       ]'
 spec:
+  type: {{ .Values.service.type }}
   ports:
-  - name: uui
-    nodePort: {{ .Values.uuiPortPrefix }}98
-    port: 8080
+    {{if eq .Values.service.type "NodePort" -}}
+    - port: {{ .Values.service.internalPort }}
+      nodePort: {{ .Values.global.uuiPortPrefix | default .Values.uuiPortPrefix }}{{ .Values.service.nodePort }}
+      name: {{ .Values.service.name }}
+    {{- else -}}
+    - port: {{ .Values.service.externalPort }}
+      targetPort: {{ .Values.service.internalPort }}
+      name: {{ .Values.service.name }}
+    {{- end}}
   selector:
-    app: uui
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableUuiServer }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: uui-server
-  name: uui-server
-  namespace: "{{ .Values.nsPrefix }}"
-  annotations:
-    msb.onap.org/service-info: '[
-      {
-          "serviceName": "usecaseui-server",
-          "version": "v1",
-          "url": "/api/usecaseui/server/v1",
-          "protocol": "UI"
-          "port": "8080",
-          "visualRange":"1|0"
-      }
-      ]'
-spec:
-  ports:
-  - name: uui-server
-    nodePort: {{ .Values.uuiPortPrefix }}99
-    port: 8082
-  selector:
-    app: uui-server
-  type: NodePort
-#{{ end }}
\ No newline at end of file
+    app: {{ include "common.name" . }}
+    release: {{ .Release.Name }}