diff --git a/stable/mediawiki/Chart.yaml b/stable/mediawiki/Chart.yaml index d1a715f9a6..8b9daa45d0 100644 --- a/stable/mediawiki/Chart.yaml +++ b/stable/mediawiki/Chart.yaml @@ -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/ diff --git a/stable/mediawiki/README.md b/stable/mediawiki/README.md index 4bca98c5b1..c1ddbb97ea 100644 --- a/stable/mediawiki/README.md +++ b/stable/mediawiki/README.md @@ -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 | `""` | diff --git a/stable/mediawiki/templates/deployment.yaml b/stable/mediawiki/templates/deployment.yaml index b61e2be9dd..11fb8a53d8 100644 --- a/stable/mediawiki/templates/deployment.yaml +++ b/stable/mediawiki/templates/deployment.yaml @@ -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: diff --git a/stable/mediawiki/templates/svc.yaml b/stable/mediawiki/templates/svc.yaml index f060d455c2..f7403f455b 100644 --- a/stable/mediawiki/templates/svc.yaml +++ b/stable/mediawiki/templates/svc.yaml @@ -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" . }} diff --git a/stable/mediawiki/values.yaml b/stable/mediawiki/values.yaml index 2be383e2dc..e3a22bccda 100644 --- a/stable/mediawiki/values.yaml +++ b/stable/mediawiki/values.yaml @@ -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: