fix: disable httpsPort by default (#18113)

Unless you are terminating SSL inside the pod, this is not needed. Most people will terminate SSL at the ingress, be it a LoadBalancer, Istio, or some other Ingress.

Fixes #18087

Signed-off-by: Harrison Heck <harrison.heck@gmail.com>
This commit is contained in:
Harrison Heck
2019-10-22 00:33:21 -07:00
committed by Kubernetes Prow Robot
parent 7b7bb4715b
commit db0db9ca1d
5 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: mediawiki
version: 8.2.7
version: 8.2.8
appVersion: 1.33.1
description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database.
home: http://www.mediawiki.org/
+1 -1
View File
@@ -83,7 +83,7 @@ The following table lists the configurable parameters of the MediaWiki chart and
| `service.type` | Kubernetes Service type | `LoadBalancer` |
| `service.loadBalancer` | Kubernetes LoadBalancerIP to request | `nil` |
| `service.port` | Service HTTP port | `80` |
| `service.httpsPort` | Service HTTPS port | `443` |
| `service.httpsPort` | Service HTTPS port | `""` |
| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` |
| `service.nodePorts.http` | Kubernetes http node port | `""` |
| `service.nodePorts.https` | Kubernetes https node port | `""` |
@@ -113,8 +113,10 @@ spec:
ports:
- name: http
containerPort: 80
{{- if .Values.service.httpsPort }}
- name: https
containerPort: 443
{{ end }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
httpGet:
+2
View File
@@ -22,11 +22,13 @@ spec:
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.http)))}}
nodePort: {{ .Values.service.nodePorts.http }}
{{- end }}
{{- if .Values.service.httpsPort }}
- name: https
port: {{ .Values.service.httpsPort }}
targetPort: https
{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.https)))}}
nodePort: {{ .Values.service.nodePorts.https }}
{{- end }}
{{- end }}
selector:
app: {{ template "mediawiki.name" . }}
+2 -1
View File
@@ -151,7 +151,8 @@ service:
# HTTP Port
port: 80
# HTTPS Port
httpsPort: 443
## Set this to any value (recommended: 443) to enable the https service port
# httpsPort: 443
## Use nodePorts to requets some specific ports when usin NodePort
## nodePorts:
## http: <to set explicitly, choose port between 30000-32767>