From 539a6d1285aee82c0425404f772281528c0da957 Mon Sep 17 00:00:00 2001 From: Matt Pryor Date: Fri, 21 Oct 2022 10:44:19 +0100 Subject: [PATCH] Add support for enabling ingress generically --- charts/cluster-addons/templates/ingress-nginx.yaml | 2 +- charts/cluster-addons/values.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/cluster-addons/templates/ingress-nginx.yaml b/charts/cluster-addons/templates/ingress-nginx.yaml index 83d5238..f7fa36b 100644 --- a/charts/cluster-addons/templates/ingress-nginx.yaml +++ b/charts/cluster-addons/templates/ingress-nginx.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ingress.nginx.enabled }} +{{- if and .Values.ingress.enabled .Values.ingress.nginx.enabled }} --- apiVersion: v1 kind: Secret diff --git a/charts/cluster-addons/values.yaml b/charts/cluster-addons/values.yaml index 523b43e..f89d1a7 100644 --- a/charts/cluster-addons/values.yaml +++ b/charts/cluster-addons/values.yaml @@ -135,11 +135,14 @@ kubernetesDashboard: # Settings for ingress controllers ingress: + # Indicates if ingress controllers should be enabled + enabled: false # Settings for the Nginx ingress controller # https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx#configuration nginx: # Indicates if the Nginx ingress controller should be enabled - enabled: false + # The Nginx ingress controller is enabled by default if ingress controllers are enabled + enabled: true chart: repo: https://kubernetes.github.io/ingress-nginx name: ingress-nginx