From 18d86ca8bb83586889567b9bb1ea32836f2db051 Mon Sep 17 00:00:00 2001 From: joe1chen Date: Mon, 10 Dec 2018 15:06:18 -0800 Subject: [PATCH] Features/kong ingress controller custom ingress class (#9870) * Allow the ingress-class to be customized in the values.yaml. Signed-off-by: Joseph Chen * Update readme Signed-off-by: Joseph Chen * Bump chart version to 0.6.6 Signed-off-by: Joseph Chen * Remove extra blank line. Signed-off-by: Joseph Chen --- stable/kong/Chart.yaml | 2 +- stable/kong/README.md | 1 + stable/kong/templates/controller-deployment.yaml | 2 ++ stable/kong/values.yaml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml index 6e6762cae0..4836704451 100644 --- a/stable/kong/Chart.yaml +++ b/stable/kong/Chart.yaml @@ -12,5 +12,5 @@ maintainers: name: kong sources: - https://github.com/Kong/kong -version: 0.6.5 +version: 0.6.6 appVersion: 0.14.1 diff --git a/stable/kong/README.md b/stable/kong/README.md index aa043a7f13..a6e85fb6fd 100644 --- a/stable/kong/README.md +++ b/stable/kong/README.md @@ -177,3 +177,4 @@ https://github.com/Kong/kubernetes-ingress-controller/blob/master/docs/custom-ty | image.tag | Version of the ingress controller | 0.2.0 | | readinessProbe | Kong ingress controllers readiness probe | | | livenessProbe | Kong ingress controllers liveness probe | | +| ingressClass | The ingress-class value for controller | nginx diff --git a/stable/kong/templates/controller-deployment.yaml b/stable/kong/templates/controller-deployment.yaml index 9f4f8100c8..7824bde6f6 100644 --- a/stable/kong/templates/controller-deployment.yaml +++ b/stable/kong/templates/controller-deployment.yaml @@ -118,6 +118,8 @@ spec: - --default-backend-service={{ .Release.Namespace }}/{{ template "kong.fullname" . }}-proxy # Service from were we extract the IP address/es to use in Ingress status - --publish-service={{ .Release.Namespace }}/{{ template "kong.fullname" . }}-proxy + # Set the ingress class + - --ingress-class={{ .Values.ingressController.ingressClass }} env: - name: POD_NAME valueFrom: diff --git a/stable/kong/values.yaml b/stable/kong/values.yaml index 49bffe66a5..e9456b5d85 100644 --- a/stable/kong/values.yaml +++ b/stable/kong/values.yaml @@ -195,3 +195,5 @@ ingressController: # The name of the ServiceAccount to use. # If not set and create is true, a name is generated using the fullname template name: + + ingressClass: nginx