[bitnami/kong] Add option to disable HTTP ports (#7423)

This commit is contained in:
Miguel Ruiz
2021-09-09 09:35:22 +02:00
committed by GitHub
parent 8757a51c33
commit d4dd3f34b2
5 changed files with 14 additions and 5 deletions

View File

@@ -34,4 +34,4 @@ name: kong
sources:
- https://github.com/bitnami/bitnami-docker-kong
- https://konghq.com/
version: 4.0.5
version: 4.1.0

View File

@@ -122,6 +122,7 @@ To uninstall/delete the `my-release` deployment:
| `service.exposeAdmin` | Add the Kong Admin ports to the service | `false` |
| `service.adminHttpPort` | kong admin HTTPS service port (only if service.exposeAdmin=true) | `8001` |
| `service.adminHttpsPort` | kong admin HTTPS service port (only if service.exposeAdmin=true) | `8444` |
| `service.disableHttpPort` | Disable Kong proxy HTTP and Kong admin HTTP ports | `false` |
| `service.proxyHttpNodePort` | Port to bind to for NodePort service type (proxy HTTP) | `""` |
| `service.proxyHttpsNodePort` | Port to bind to for NodePort service type (proxy HTTPS) | `""` |
| `service.adminHttpNodePort` | Port to bind to for NodePort service type (admin HTTP) | `""` |

View File

@@ -1,4 +1,5 @@
{{- if .Values.ingress.enabled -}}
{{- $backendPort := ternary "https-proxy" "http-proxy" .Values.service.disableHttpPort }}
apiVersion: {{ template "common.capabilities.ingress.apiVersion" . }}
kind: Ingress
metadata:
@@ -32,7 +33,7 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http-proxy" "context" $) | nindent 14 }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" $backendPort "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingress.extraHosts }}
- host: {{ .name | quote }}
@@ -42,7 +43,7 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http-proxy" "context" $) | nindent 14 }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" $backendPort "context" $) | nindent 14 }}
{{- end }}
{{- if or .Values.ingress.tls .Values.ingress.extraTls }}
tls:

View File

@@ -20,15 +20,16 @@ metadata:
spec:
type: {{ .Values.service.type }}
{{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.externalTrafficPolicy)) }}
externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
{{- end }}
{{- if not (empty .Values.service.clusterIP) }}
clusterIP: {{ .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
{{- end }}
{{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{- end }}
ports:
{{- if not .Values.service.disableHttpPort }}
- port: {{ .Values.service.proxyHttpPort }}
targetPort: http-proxy
protocol: TCP
@@ -38,6 +39,7 @@ spec:
{{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- end }}
- port: {{ .Values.service.proxyHttpsPort }}
targetPort: https-proxy
protocol: TCP
@@ -48,6 +50,7 @@ spec:
nodePort: null
{{- end }}
{{- if .Values.service.exposeAdmin }}
{{- if not .Values.service.disableHttpPort }}
- port: {{ .Values.service.adminHttpPort }}
targetPort: http-admin
protocol: TCP
@@ -57,6 +60,7 @@ spec:
{{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- end }}
- port: {{ .Values.service.adminHttpsPort }}
targetPort: https-admin
protocol: TCP

View File

@@ -257,6 +257,9 @@ service:
## @param service.adminHttpsPort kong admin HTTPS service port (only if service.exposeAdmin=true)
##
adminHttpsPort: 8444
## @param service.disableHttpPort Disable Kong proxy HTTP and Kong admin HTTP ports
##
disableHttpPort: false
## Specify the nodePort value for the LoadBalancer and NodePort service types.
## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
## @param service.proxyHttpNodePort Port to bind to for NodePort service type (proxy HTTP)