bugfix: dont skip reconcile for unchanged policy if last sync failed

Alexander Zielenski · k8s-publishing-bot · commit b7459bd8792f · 2024-01-26T18:57:30.000-08:00
Kubernetes-commit: cc819ed4ae7b75d0e28f567dac8c8282b647369a
diff --git a/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go b/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go
@@ -180,8 +180,9 @@ func (c *policyController) reconcilePolicyDefinitionSpec(namespace, name string,
 		celmetrics.Metrics.ObserveDefinition(context.TODO(), "active", "deny")
 	}
 
-	// Skip reconcile if the spec of the definition is unchanged
-	if info.lastReconciledValue != nil && definition != nil &&
+	// Skip reconcile if the spec of the definition is unchanged and had a
+	// successful previous sync
+	if info.configurationError == nil && info.lastReconciledValue != nil && definition != nil &&
 		apiequality.Semantic.DeepEqual(info.lastReconciledValue.Spec, definition.Spec) {
 		return nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,9 @@ func (c *policyController) reconcilePolicyDefinitionSpec(namespace, name string,`
`180`	`180`	`celmetrics.Metrics.ObserveDefinition(context.TODO(), "active", "deny")`
`181`	`181`	`}`
`182`	`182`
`183`		`- // Skip reconcile if the spec of the definition is unchanged`
`184`		`- if info.lastReconciledValue != nil && definition != nil &&`
	`183`	`+ // Skip reconcile if the spec of the definition is unchanged and had a`
	`184`	`+ // successful previous sync`
	`185`	`+ if info.configurationError == nil && info.lastReconciledValue != nil && definition != nil &&`
`185`	`186`	`apiequality.Semantic.DeepEqual(info.lastReconciledValue.Spec, definition.Spec) {`
`186`	`187`	`return nil`
`187`	`188`	`}`