This is an automated email from the ASF dual-hosted git repository.
daisyguo pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 2633f93 ingress cleanup: allow default value for httpsNodePort (#368)
2633f93 is described below
commit 2633f93c138ac2b4f2d6cc328f69c27625bc1ca7
Author: David Grove <[email protected]>
AuthorDate: Wed Nov 21 00:40:19 2018 -0500
ingress cleanup: allow default value for httpsNodePort (#368)
Make usage of nginx.httpsNodePort templates conditional on
ingress.type being NodePort to enable a default value
for nginx.httpsNodePort to be defined.
---
helm/openwhisk/templates/nginx-svc.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/helm/openwhisk/templates/nginx-svc.yaml
b/helm/openwhisk/templates/nginx-svc.yaml
index ff4ba7d..066b81e 100644
--- a/helm/openwhisk/templates/nginx-svc.yaml
+++ b/helm/openwhisk/templates/nginx-svc.yaml
@@ -11,7 +11,7 @@ metadata:
spec:
{{- if eq .Values.whisk.ingress.type "LoadBalancer" }}
type: LoadBalancer
- {{- else if .Values.nginx.httpsNodePort }}
+ {{- else if eq .Values.whisk.ingress.type "NodePort" }}
type: NodePort
{{- end }}
selector:
@@ -20,7 +20,7 @@ spec:
- port: {{ .Values.nginx.httpPort }}
name: http
- port: {{ .Values.nginx.httpsPort }}
- {{- if .Values.nginx.httpsNodePort }}
+ {{- if eq .Values.whisk.ingress.type "NodePort" }}
nodePort: {{ .Values.nginx.httpsNodePort }}
{{- end }}
name: https-api
