From d4dd3f34b22ebe92bf04acb533d020f9771380f6 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 9 Sep 2021 09:35:22 +0200 Subject: [PATCH] [bitnami/kong] Add option to disable HTTP ports (#7423) --- bitnami/kong/Chart.yaml | 2 +- bitnami/kong/README.md | 1 + bitnami/kong/templates/ingress.yaml | 5 +++-- bitnami/kong/templates/service.yaml | 8 ++++++-- bitnami/kong/values.yaml | 3 +++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bitnami/kong/Chart.yaml b/bitnami/kong/Chart.yaml index d1be2fdd6b..56b7bac184 100644 --- a/bitnami/kong/Chart.yaml +++ b/bitnami/kong/Chart.yaml @@ -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 diff --git a/bitnami/kong/README.md b/bitnami/kong/README.md index 2b5ce9b996..0a9fa4a5a5 100644 --- a/bitnami/kong/README.md +++ b/bitnami/kong/README.md @@ -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) | `""` | diff --git a/bitnami/kong/templates/ingress.yaml b/bitnami/kong/templates/ingress.yaml index 0210d8edad..4a594d37c0 100644 --- a/bitnami/kong/templates/ingress.yaml +++ b/bitnami/kong/templates/ingress.yaml @@ -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: diff --git a/bitnami/kong/templates/service.yaml b/bitnami/kong/templates/service.yaml index a5af0c99ec..209af54c27 100644 --- a/bitnami/kong/templates/service.yaml +++ b/bitnami/kong/templates/service.yaml @@ -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 diff --git a/bitnami/kong/values.yaml b/bitnami/kong/values.yaml index f3e9755acf..89fbfb5cfc 100644 --- a/bitnami/kong/values.yaml +++ b/bitnami/kong/values.yaml @@ -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)