Merge "Add v1 service endpoints for MultiCloud components"

8 files changed, 51 insertions, 23 deletions

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
index cbe426edae..fda5ecefc8 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -34,18 +34,26 @@ metadata:
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
+    },
+    {
+      "serviceName": "multicloud-ocata",
+      "version": "v1",
+      "url": "/api/multicloud-ocata/v1",
+      "protocol": "REST",
+      "port": "{{ .Values.service.externalPort }}",
+      "visualRange": "1"
     }
     ]'
 spec:
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - name: http-{{ .Values.service.name }}
-    port: {{ .Values.service.externalPort }}
+  - port: {{ .Values.service.externalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+    name: {{ .Values.service.portName }}
   {{- else -}}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
-    name: http-{{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
index 699b908c43..dcb7df4568 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml
@@ -59,6 +59,7 @@ liveness:
 service:
   type: NodePort
   name: multicloud-ocata
+  portName: multicloud-ocata
   externalPort: 9006
   internalPort: 9006
   nodePort: 93
@@ -84,4 +85,4 @@ resources:
     requests:
       cpu: 20m
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
index b53aef4bed..b34cbecb9d 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -34,18 +34,26 @@ metadata:
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
+    },
+    {
+      "serviceName": "multicloud-vio",
+      "version": "v1",
+      "url": "/api/multicloud-vio/v1",
+      "protocol": "REST",
+      "port": "{{ .Values.service.externalPort }}",
+      "visualRange": "1"
     }
     ]'
 spec:
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - name: http-{{ .Values.service.name }}
-    port: {{ .Values.service.externalPort }}
+  - port: {{ .Values.service.externalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+    name: {{ .Values.service.portName }}
   {{- else -}}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
-    name: http-{{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
index 810646dc13..b23b014deb 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml
@@ -59,6 +59,7 @@ liveness:
 service:
   type: NodePort
   name: multicloud-vio
+  portName: multicloud-vio
   externalPort: 9004
   internalPort: 9004
   nodePort: 92
@@ -84,4 +85,4 @@ resources:
     requests:
       cpu: 20m
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
index f876bb97ac..c1128bbf47 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ include "common.servicename" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -32,7 +32,7 @@ metadata:
       "version": "v0",
       "url": "/api/multicloud-titanium_cloud/v0",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     },
     {
@@ -40,7 +40,7 @@ metadata:
       "version": "v0",
       "url": "/api/multicloud-titaniumcloud/v0",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     },
     {
@@ -48,7 +48,7 @@ metadata:
       "version": "v1",
       "url": "/api/multicloud-titaniumcloud/v1",
       "protocol": "REST",
-      "port": "{{ .Values.service.internalPort }}",
+      "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
     }
     ]'
@@ -56,13 +56,13 @@ metadata:
 spec:
   ports:
   {{ if eq .Values.service.type "NodePort" }}
-  - name: http-{{ .Values.service.name }}
-    port: {{ .Values.service.externalPort }}
+  - port: {{ .Values.service.externalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+    name: {{ .Values.service.portName }}
   {{ else }}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
-    name: http-{{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{ end }}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index 4ebf84399f..913f682901 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -43,6 +43,7 @@ config:
 service:
   type: NodePort
   name: multicloud-titaniumcloud
+  portName: multicloud-titaniumcloud
   externalPort: 9005
   internalPort: 9005
   nodePort: 94
@@ -84,4 +85,4 @@ resources:
     requests:
       cpu: 20m
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index 1ad3e5164c..e34bdf4502 100644
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ .Values.service.portName }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -34,18 +34,26 @@ metadata:
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
       "visualRange": "1"
+    },
+    {
+      "serviceName": "multicloud",
+      "version": "v1",
+      "url": "/api/multicloud/v1",
+      "protocol": "REST",
+      "port": "{{ .Values.service.externalPort }}",
+      "visualRange": "1"
     }
     ]'
 spec:
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - name: {{ .Values.service.name }}
-    port: {{ .Values.service.externalPort }}
+  - port: {{ .Values.service.externalPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+    name: {{ .Values.service.portName }}
   {{- else -}}
   - port: {{ .Values.service.externalPort }}
     targetPort: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.name }}
+    name: {{ .Values.service.portName }}
   {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 3f1da7eb0c..5756d9f616 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -63,6 +63,7 @@ liveness:
 service:
   type: NodePort
   name: multicloud
+  portName: multicloud-framework
   externalPort: 9001
   internalPort: 9001
   nodePort: 91
@@ -88,4 +89,4 @@ resources:
     requests:
       cpu: 20m
       memory: 2Gi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}