Merge pull request #1973 from mpatlasov/OCPBUGS-58254-CredentialsRequestController-do-not-sync-if-Unmanaged

openshift-merge-bot[bot] · web-flow · commit cd26fa5a3d88 · 2025-07-03T08:42:15.000Z
OCPBUGS-58254: CredentialsRequestController: do not sync if the state is not Managed
diff --git a/pkg/operator/csi/credentialsrequestcontroller/credentials_request_controller.go b/pkg/operator/csi/credentialsrequestcontroller/credentials_request_controller.go
@@ -89,6 +89,9 @@ func (c CredentialsRequestController) sync(ctx context.Context, syncContext fact
 	if err != nil {
 		return err
 	}
+	if spec.ManagementState != opv1.Managed {
+		return nil
+	}
 
 	sync, err := shouldSync(c.operatorLister)
 	if err != nil {
diff --git a/pkg/operator/csi/credentialsrequestcontroller/credentials_request_controller_test.go b/pkg/operator/csi/credentialsrequestcontroller/credentials_request_controller_test.go
@@ -131,7 +131,9 @@ func TestSync(t *testing.T) {
 			unstructured.SetNestedField(cr.Object, tc.inputSecretProvisioned, "status", "provisioned")
 			dynamicClient.credentialRequest = cr
 
-			operatorClient := v1helpers.NewFakeOperatorClient(&opv1.OperatorSpec{}, &opv1.OperatorStatus{}, nil)
+			operatorClient := v1helpers.NewFakeOperatorClient(&opv1.OperatorSpec{
+				ManagementState: opv1.Managed,
+			}, &opv1.OperatorStatus{}, nil)
 			recorder := events.NewInMemoryRecorder("test", clocktesting.NewFakePassiveClock(time.Now()))
 			controller := NewCredentialsRequestController(
 				controllerName,

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,9 @@ func (c CredentialsRequestController) sync(ctx context.Context, syncContext fact`
`89`	`89`	`if err != nil {`
`90`	`90`	`return err`
`91`	`91`	`}`
	`92`	`+ if spec.ManagementState != opv1.Managed {`
	`93`	`+ return nil`
	`94`	`+ }`
`92`	`95`
`93`	`96`	`sync, err := shouldSync(c.operatorLister)`
`94`	`97`	`if err != nil {`