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

mfojtik · soltysh · commit 1a1d4697232f · 2022-09-20T15:53:24.000+02:00
Origin-commit: d3ceac4e065c3d2689192fda102303030cfdb928

openshift-rebase(v1.24):source=a1c12a7dd32
diff --git a/pkg/controlplane/controller/crdregistration/crdregistration_controller.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go
@@ -195,6 +195,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
`@@ -195,6 +195,10 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou`
`195`	`195`	`apiServiceName := groupVersion.Version + "." + groupVersion.Group`
`196`	`196`
`197`	`197`	`if apiserver.APIServiceAlreadyExists(groupVersion) {`
	`198`	`+ // Removing APIService from sync means the CRD registration controller won't sync this APIService`
	`199`	`+ // anymore. If the APIService is managed externally, this will mean the external component can`
	`200`	`+ // update this APIService without CRD controller stomping the changes on it.`
	`201`	`+ c.apiServiceRegistration.RemoveAPIServiceToSync(apiServiceName)`
`198`	`202`	`return nil`
`199`	`203`	`}`
`200`	`204`