From 290a2fcf23f0b705ff915deaa9544c10ecd3da8d Mon Sep 17 00:00:00 2001 From: Yigit Ozen Date: Wed, 29 Nov 2023 13:17:03 +0300 Subject: [PATCH] [Helm] Don't try to install Traefik Middleware when Traefik is disabled (#7184) This PR is complementary to #7132. #7132 updated ingress templates to work with `traefik.enabled=false` and `ingress.enabled=true` values. However the templates in `templates/analytics/middlewares` path lead to creation of resources of kind `Middleware`, which is a Traefik CRD. Helm install fails if Traefik is not installed on the cluster. Changing the top-level conditional from `ingress.enabled` to `traefik.enabled` solves the issue. --- .../20231129_112017_canyigitozen_helm_traefik_middleware.md | 3 +++ helm-chart/templates/analytics/middlewares/forwardauth.yaml | 2 +- helm-chart/templates/analytics/middlewares/stripprefix.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20231129_112017_canyigitozen_helm_traefik_middleware.md diff --git a/changelog.d/20231129_112017_canyigitozen_helm_traefik_middleware.md b/changelog.d/20231129_112017_canyigitozen_helm_traefik_middleware.md new file mode 100644 index 000000000000..d8e376ef8bce --- /dev/null +++ b/changelog.d/20231129_112017_canyigitozen_helm_traefik_middleware.md @@ -0,0 +1,3 @@ +### Fixed + +- \[Helm\] Fixed installing Traefik Middleware even if Traefik is disabled in the values () diff --git a/helm-chart/templates/analytics/middlewares/forwardauth.yaml b/helm-chart/templates/analytics/middlewares/forwardauth.yaml index 3857c3ea39b6..18ef722a6028 100644 --- a/helm-chart/templates/analytics/middlewares/forwardauth.yaml +++ b/helm-chart/templates/analytics/middlewares/forwardauth.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.ingress.enabled .Values.analytics.enabled }} +{{- if and .Values.traefik.enabled .Values.analytics.enabled }} apiVersion: traefik.containo.us/v1alpha1 kind: Middleware diff --git a/helm-chart/templates/analytics/middlewares/stripprefix.yaml b/helm-chart/templates/analytics/middlewares/stripprefix.yaml index 642a32e81c41..350d1d58dbae 100644 --- a/helm-chart/templates/analytics/middlewares/stripprefix.yaml +++ b/helm-chart/templates/analytics/middlewares/stripprefix.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.ingress.enabled .Values.analytics.enabled }} +{{- if and .Values.traefik.enabled .Values.analytics.enabled }} apiVersion: traefik.containo.us/v1alpha1 kind: Middleware