UPSTREAM: <carry>: remove apiservice from sync in CRD registration when it exists

mfojtik · bertinatto · commit 7527570bba04 · 2025-04-03T13:09:09.000-03:00
OpenShift-Rebase-Source: 1a1d469
diff --git a/pkg/controlplane/controller/crdregistration/crdregistration_controller.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go
@@ -198,6 +198,10 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou
 	apiServiceName := groupVersion.Version + "." + groupVersion.Group
 
 	if apiserver.APIServiceAlreadyExists(groupVersion) {
+		// Removing APIService from sync means the CRD registration controller won't sync this APIService
+		// anymore. If the APIService is managed externally, this will mean the external component can
+		// update this APIService without CRD controller stomping the changes on it.
+		c.apiServiceRegistration.RemoveAPIServiceToSync(apiServiceName)
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,10 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou`
`198`	`198`	`apiServiceName := groupVersion.Version + "." + groupVersion.Group`
`199`	`199`
`200`	`200`	`if apiserver.APIServiceAlreadyExists(groupVersion) {`
	`201`	`+ // Removing APIService from sync means the CRD registration controller won't sync this APIService`
	`202`	`+ // anymore. If the APIService is managed externally, this will mean the external component can`
	`203`	`+ // update this APIService without CRD controller stomping the changes on it.`
	`204`	`+ c.apiServiceRegistration.RemoveAPIServiceToSync(apiServiceName)`
`201`	`205`	`return nil`
`202`	`206`	`}`
`203`	`207`