Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix cds-blueprint-processor and dependent
[oom.git]
/
kubernetes
/
multicloud
/
charts
/
multicloud-ocata
/
templates
/
service.yaml
diff --git
a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml
index
cbe426e
..
fda5ece
100644
(file)
--- 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:
apiVersion: v1
kind: Service
metadata:
- name: {{
.Values.service.name
}}
+ name: {{
include "common.servicename" .
}}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-34,18
+34,26
@@
metadata:
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
"visualRange": "1"
"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" -}}
}
]'
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 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name:
http-{{ .Values.service.n
ame }}
+ name:
{{ .Values.service.portN
ame }}
{{- end}}
selector:
app: {{ include "common.name" . }}
{{- end}}
selector:
app: {{ include "common.name" . }}