feat(base-cluster/nginx): add possibility to disable ingress (#489)

Add ability to disable ingress.
teutonet · Oct 6, 2023 · c5d822a · c5d822a
1 parent f94fc7a
commit c5d822a
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 3 deletions.
diff --git a/charts/base-cluster/ci/disabled-ingress-values.yaml b/charts/base-cluster/ci/disabled-ingress-values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  enabled: false
diff --git a/charts/base-cluster/templates/cert-manager/clusterissuer.yaml b/charts/base-cluster/templates/cert-manager/clusterissuer.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.certManager.email }}
+{{- if and .Values.certManager.email .Values.ingress.enabled }}
 {{- include "base-cluster.helm.resourceWithDependencies" (dict "name" "clusterissuer-letsencrypt-production" "resource" (include "base-cluster.cert-manager.clusterIssuer" (dict "name" "production" "url" "https://acme-v02.api.letsencrypt.org/directory" "context" $)) "dependencies" (dict "cert-manager" "cert-manager") "context" $ "additionalLabels" (dict "app.kubernetes.io/component" "cert-manager")) }}
 ---
 {{- include "base-cluster.helm.resourceWithDependencies" (dict "name" "clusterissuer-letsencrypt-staging" "resource" (include "base-cluster.cert-manager.clusterIssuer" (dict "name" "staging" "url" "https://acme-staging-v02.api.letsencrypt.org/directory" "context" $)) "dependencies" (dict "cert-manager" "cert-manager") "context" $ "additionalLabels" (dict "app.kubernetes.io/component" "cert-manager")) }}

diff --git a/charts/base-cluster/templates/global/cluster-ingress.yaml b/charts/base-cluster/templates/global/cluster-ingress.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.dns.provider .Values.global.baseDomain }}
+{{- if and .Values.dns.provider .Values.global.baseDomain .Values.ingress.enabled }}
 {{- if false }}
 apiVersion: networking.k8s.io/v1
 {{- else }}

diff --git a/charts/base-cluster/templates/ingress/nginx.yaml b/charts/base-cluster/templates/ingress/nginx.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.ingress.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -82,3 +83,4 @@ spec:
       image:
         registry: {{ .Values.global.imageRegistry }}
       {{- end }}
+  {{ end }}
diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
@@ -93,6 +93,7 @@ dashboards:
     metrics:
       <<: *dashboard
       gnetId: 8588
+    {{- if .Values.ingress.enabled}}
     ingress-nginx:
       <<: *dashboard
       gnetId: 9614
@@ -101,6 +102,7 @@ dashboards:
       <<: *dashboard
       gnetId: 11001
       revision: 1
+    {{- end}}
     flux:
       <<: *dashboard
       gnetId: 16714

diff --git a/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml b/charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml
@@ -1,6 +1,6 @@
 {{- define "base-cluster.monitoring.ingress" -}}
   {{- $ingress := dig .name "ingress" nil .context.Values.monitoring | required (printf "You need to set the `ingress` for %s" .name) -}}
-  {{- if and .context.Values.certManager.email $ingress.enabled (or .context.Values.global.baseDomain $ingress.customDomain) -}}
+  {{- if and .context.Values.certManager.email $ingress.enabled .context.Values.ingress.enabled (or .context.Values.global.baseDomain $ingress.customDomain) -}}
     {{- $host := include (printf "base-cluster.%s.host" .name) .context -}}
 ingress:
   enabled: true

diff --git a/charts/base-cluster/values.schema.json b/charts/base-cluster/values.schema.json
@@ -929,6 +929,11 @@
         "resources": {
           "$ref": "#/$defs/resourceRequirements"
         },
+        "enabled": {
+          "type": [
+            "boolean"
+          ]
+        },
         "IP": {
           "type": [
             "string",

diff --git a/charts/base-cluster/values.yaml b/charts/base-cluster/values.yaml
@@ -14,6 +14,7 @@ global:
       additionalLabels:
         app.kubernetes.io/component: cert-manager
     ingress-nginx:
+      condition: "{{ .Values.ingress.enabled }}"
       additionalLabels:
         app.kubernetes.io/component: ingress
     kyverno:
@@ -364,6 +365,7 @@ flux:
   gitRepositories: {}
 
 ingress:
+  enabled: true
   replicas: 2
   resources:
     requests: