daisy-ycguo closed pull request #368: ingress cleanup: allow default value for
httpsNodePort
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/368
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
