diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-12 02:27:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-12 02:27:33 +0000 |
| commit | 36c5f8be7cc94909dc58b5a642e5f338883c8c49 (patch) | |
| tree | 5675b9a7a0822a49797ce3a489ee58c44e5ea224 /kubernetes/multicloud/charts/multicloud-windriver | |
| parent | 4bfde1b98ba334c0adec16a9b2291ad9f48c18da (diff) | |
| parent | 0c54f18e22c1a6039eb0c0d24b2cfd27a847b133 (diff) | |
Merge "Add v1 service endpoints for MultiCloud components"
Diffstat (limited to 'kubernetes/multicloud/charts/multicloud-windriver')
| -rw-r--r-- | kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/multicloud/charts/multicloud-windriver/values.yaml | 3 |
2 files changed, 9 insertions, 8 deletions
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: {} |