Merge branch 'main' into tallaxes/test-suites/termination

Azure · Jan 14, 2025 · 6d3a6e7 · 6d3a6e7
2 parents 1827419 + 93d641c
commit 6d3a6e7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/test/pkg/environment/common/expectations.go b/test/pkg/environment/common/expectations.go
@@ -366,7 +366,12 @@ func (env *Environment) EventuallyExpectKarpenterRestarted() {
 	GinkgoHelper()
 	By("rolling out the new karpenter deployment")
 	env.EventuallyExpectRollout("karpenter", "kube-system")
-	env.ExpectKarpenterLeaseOwnerChanged()
+
+	if !lo.ContainsBy(env.ExpectSettings(), func(v corev1.EnvVar) bool {
+		return v.Name == "DISABLE_LEADER_ELECTION" && v.Value == "true"
+	}) {
+		env.ExpectKarpenterLeaseOwnerChanged()
+	}
 }
 
 func (env *Environment) ExpectKarpenterLeaseOwnerChanged() {