Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Expose multicloud endpoints in https"
[oom.git]
/
kubernetes
/
dmaap
/
components
/
dmaap-dr-node
/
templates
/
service.yaml
diff --git
a/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
b/kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
index
b720701
..
77aae1d
100644
(file)
--- a/
kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
+++ b/
kubernetes/dmaap/components/dmaap-dr-node/templates/service.yaml
@@
-20,7
+20,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
heritage: {{ .Release.Service }}
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
@@
-28,13
+28,15
@@
spec:
type: {{.Values.config.dmaapDrNode.servicetype}}
ports:
{{if eq .Values.config.dmaapDrNode.servicetype "NodePort" -}}
type: {{.Values.config.dmaapDrNode.servicetype}}
ports:
{{if eq .Values.config.dmaapDrNode.servicetype "NodePort" -}}
+ {{- if .Values.global.allow_http }}
- port: {{.Values.config.dmaapDrNode.externalPort}}
targetPort: {{.Values.config.dmaapDrNode.internalPort}}
- port: {{.Values.config.dmaapDrNode.externalPort}}
targetPort: {{.Values.config.dmaapDrNode.internalPort}}
- nodePort: {{ .Values.global.nodePortPrefix
| default .Values.nodePortPrefix
}}{{.Values.config.dmaapDrNode.nodePort}}
+ nodePort: {{ .Values.global.nodePortPrefix
Ext | default .Values.nodePortPrefixExt
}}{{.Values.config.dmaapDrNode.nodePort}}
name: {{.Values.config.dmaapDrNode.name}}
name: {{.Values.config.dmaapDrNode.name}}
+ {{- end}}
- port: {{.Values.config.dmaapDrNode.externalPort2}}
targetPort: {{.Values.config.dmaapDrNode.internalPort2}}
- port: {{.Values.config.dmaapDrNode.externalPort2}}
targetPort: {{.Values.config.dmaapDrNode.internalPort2}}
- nodePort: {{ .Values.global.nodePortPrefix
| default .Values.nodePortPrefix
}}{{.Values.config.dmaapDrNode.nodePort2}}
+ nodePort: {{ .Values.global.nodePortPrefix
Ext | default .Values.nodePortPrefixExt
}}{{.Values.config.dmaapDrNode.nodePort2}}
name: {{.Values.config.dmaapDrNode.name}}2
{{- else -}}
- port: {{.Values.config.dmaapDrNode.externalPort}}
name: {{.Values.config.dmaapDrNode.name}}2
{{- else -}}
- port: {{.Values.config.dmaapDrNode.externalPort}}
@@
-46,4
+48,4
@@
spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
\ No newline at end of file
+ release: {{
include "common.release" .
}}
\ No newline at end of file