Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Oct 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29080d1
feat(base-cluster/nginx): add possibility to disable ingress
marvinWolff Aug 7, 2023
8779051
fix(ingress): fix suggestions
marvinWolff Aug 28, 2023
68e95fd
feat(ci): test for disabled ingress
marvinWolff Aug 28, 2023
f86aae0
feat(ci): add new line to check
marvinWolff Aug 28, 2023
cfec904
fix(ingress): dont create namespace if igress is deactivated
marvinWolff Sep 26, 2023
cb5e4fb
fix(ingress): disable grafana charts and Clusterissuers when ingress …
marvinWolff Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/base-cluster/ci/disabled-ingress-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ingress:
enabled: false
2 changes: 1 addition & 1 deletion charts/base-cluster/templates/cert-manager/clusterissuer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")) }}
Expand Down
2 changes: 1 addition & 1 deletion charts/base-cluster/templates/global/cluster-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions charts/base-cluster/templates/ingress/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.ingress.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
Expand Down Expand Up @@ -71,3 +72,4 @@ spec:
image:
registry: {{ .Values.global.imageRegistry }}
{{- end }}
{{ end }}
2 changes: 2 additions & 0 deletions charts/base-cluster/templates/monitoring/kube-prometheus-stack/_grafana-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ dashboards:
metrics:
<<: *dashboard
gnetId: 8588
{{- if .Values.ingress.enabled}}
ingress-nginx:
<<: *dashboard
gnetId: 9614
Expand All @@ -101,6 +102,7 @@ dashboards:
<<: *dashboard
gnetId: 11001
revision: 1
{{- end}}
flux:
<<: *dashboard
gnetId: 16714
Expand Down
2 changes: 1 addition & 1 deletion charts/base-cluster/templates/monitoring/kube-prometheus-stack/_helpers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions charts/base-cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,11 @@
"resources": {
"$ref": "#/$defs/resourceRequirements"
},
"enabled": {
"type": [
"boolean"
]
},
"IP": {
"type": [
"string",
Expand Down
2 changes: 2 additions & 0 deletions charts/base-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ global:
additionalLabels:
app.kubernetes.io/component: cert-manager
ingress-nginx:
condition: "{{ .Values.ingress.enabled }}"
additionalLabels:
app.kubernetes.io/component: ingress
kyverno:
Expand Down Expand Up @@ -365,6 +366,7 @@ flux:
gitRepositories: {}

ingress:
enabled: true
replicas: 2
resources:
requests:
Expand Down