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 "[DCAE] Version updates for Kohn"
[oom.git]
/
kubernetes
/
multicloud
/
templates
/
service.yaml
diff --git
a/kubernetes/multicloud/templates/service.yaml
b/kubernetes/multicloud/templates/service.yaml
index
12bbb29
..
1c483b0
100644
(file)
--- a/
kubernetes/multicloud/templates/service.yaml
+++ b/
kubernetes/multicloud/templates/service.yaml
@@
-18,7
+18,7
@@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.
portN
ame }}
+ name: {{ .Values.service.
n
ame }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-33,7
+33,11
@@
metadata:
"url": "/api/multicloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
"url": "/api/multicloud/v0",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl": "{{ .Values.config.ssl_enabled }}",
+ {{if (include "common.needTLS" .) -}}
+ "enable_ssl": {{ .Values.config.ssl_enabled }},
+ {{- else -}}
+ "enable_ssl": false,
+ {{- end}}
"visualRange": "1"
},
{
"visualRange": "1"
},
{
@@
-42,7
+46,7
@@
metadata:
"url": "/api/multicloud/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
"url": "/api/multicloud/v1",
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
- "enable_ssl":
"{{ .Values.config.ssl_enabled }}"
,
+ "enable_ssl":
{{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }}
,
"visualRange": "1"
}
]'
"visualRange": "1"
}
]'