From 77d9594c096c30e567a4bbb6e5030b9ff6da28d5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2024 07:57:20 -0400 Subject: [PATCH] fix: use annotation to check for ingress method --- plugins/scheduler-k3s/templates/chart/ingress.yaml | 1 + plugins/scheduler-k3s/triggers.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/scheduler-k3s/templates/chart/ingress.yaml b/plugins/scheduler-k3s/templates/chart/ingress.yaml index d1505a7c1..b0eaa6c57 100644 --- a/plugins/scheduler-k3s/templates/chart/ingress.yaml +++ b/plugins/scheduler-k3s/templates/chart/ingress.yaml @@ -8,6 +8,7 @@ kind: Ingress metadata: annotations: dokku.com/managed: "true" + dokku.com/ingress-method: "domains" {{- if $config.web.tls.enabled }} nginx.ingress.kubernetes.io/force-ssl-redirect: "true" {{- end }} diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go index b9dff5a83..37a1d54e6 100644 --- a/plugins/scheduler-k3s/triggers.go +++ b/plugins/scheduler-k3s/triggers.go @@ -606,7 +606,7 @@ func TriggerSchedulerDeploy(scheduler string, appName string, imageTag string) e ingressesToDelete := []string{} for _, ingress := range ingresses { - ingressIngressMethod := ingress.Labels["dokku.com/ingress-method"] + ingressIngressMethod := ingress.Annotations["dokku.com/ingress-method"] if ingressIngressMethod != "domains" { ingressesToDelete = append(ingressesToDelete, ingress.Name) }