Do not react on maintenance annotation.

metal-stack · May 8, 2024 · 92b9101 · 92b9101
1 parent a129aba
commit 92b9101
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/controllers/deployment/controller.go b/controllers/deployment/controller.go
@@ -36,6 +36,7 @@ func SetupWithManager(log logr.Logger, recorder record.EventRecorder, mgr ctrl.M
 			&v2.FirewallDeployment{},
 			builder.WithPredicates(
 				predicate.And(
+					predicate.Not(v2.AnnotationAddedPredicate(v2.MaintenanceAnnotation)),
 					predicate.Not(v2.AnnotationRemovedPredicate(v2.MaintenanceAnnotation)),
 					predicate.Or(
 						predicate.GenerationChangedPredicate{}, // prevents reconcile on status sub resource update

diff --git a/integration/suite_test.go b/integration/suite_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/metal-stack/firewall-controller-manager/controllers/firewall"
 	"github.com/metal-stack/firewall-controller-manager/controllers/monitor"
 	"github.com/metal-stack/firewall-controller-manager/controllers/set"
+	"github.com/metal-stack/firewall-controller-manager/controllers/update"
 	metalclient "github.com/metal-stack/metal-go/test/client"
 	"github.com/metal-stack/metal-lib/pkg/tag"
 	. "github.com/onsi/ginkgo/v2"
@@ -158,6 +159,14 @@ var _ = BeforeSuite(func() {
 	)
 	Expect(err).ToNot(HaveOccurred())
 
+	err = update.SetupWithManager(
+		ctrl.Log.WithName("controllers").WithName("update"),
+		mgr.GetEventRecorderFor("update-controller"),
+		mgr,
+		cc,
+	)
+	Expect(err).ToNot(HaveOccurred())
+
 	err = deployment.SetupWebhookWithManager(ctrl.Log.WithName("defaulting-webhook"), mgr, cc)
 	Expect(err).ToNot(HaveOccurred())
 	err = set.SetupWebhookWithManager(ctrl.Log.WithName("defaulting-webhook"), mgr, cc)