UPSTREAM: <carry>: remove apiservice from sync in CRD registration wh…

…en it exists Origin-commit: d3ceac4e065c3d2689192fda102303030cfdb928
openshift · Sep 7, 2021 · 052c7b5 · 052c7b5
1 parent 6299039
commit 052c7b5
Showing 1 changed file with 4 additions and 0 deletions.
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
 	}