allow multiple sources to add/remove from discovery without clobberin…

…g each other

Kubernetes-commit: 0740b11073d08262d4d6687ceedd8f0c71819ebd

go.mod

@@ -13,12 +13,12 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/net v0.8.0
-	k8s.io/api v0.0.0-20230315055831-abe66f57fdb1
+	k8s.io/api v0.0.0-20230316181320-bad7d34a01c9
 	k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
-	k8s.io/apiserver v0.0.0-20230315073602-05d2078e680a
-	k8s.io/client-go v0.0.0-20230315061912-38589731da69
-	k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8
-	k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0
+	k8s.io/apiserver v0.0.0-20230322010019-45f55ded302a
+	k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c
+	k8s.io/code-generator v0.0.0-20230325021128-1e0c52da823a
+	k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
@@ -110,11 +110,11 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20230315032826-0b4c449988b1
+	k8s.io/api => k8s.io/api v0.0.0-20230316181320-bad7d34a01c9
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230315073602-05d2078e680a
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20230315061912-38589731da69
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230322010019-45f55ded302a
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230325021128-1e0c52da823a
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c
 	k8s.io/kms => k8s.io/kms v0.0.0-20230315071547-f5c193c64781
 )

go.sum

@@ -716,18 +716,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20230315032826-0b4c449988b1 h1:wlCdY1kqV0RkfnfRr4mEZ3fGJ1VvLelr5Q2vCnCICIo=
-k8s.io/api v0.0.0-20230315032826-0b4c449988b1/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
+k8s.io/api v0.0.0-20230316181320-bad7d34a01c9 h1:RX71Fts5hM4MOPrwU2mAILmdHSQipOntTKs8SVRvZNA=
+k8s.io/api v0.0.0-20230316181320-bad7d34a01c9/go.mod h1:aZ6MBt4NMLXSxkSKFkoDaP4hTutnZIvH5dCSpOis9g4=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
 k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
-k8s.io/apiserver v0.0.0-20230315073602-05d2078e680a h1:afcOudl9GRBJEUhQwdrNLH7ANDRM8PG29Ua4mp6SPgw=
-k8s.io/apiserver v0.0.0-20230315073602-05d2078e680a/go.mod h1:fPZ8XN2AIpVVqcRAVVeJkcH5udJbU86i9VmTf68hUJo=
-k8s.io/client-go v0.0.0-20230315061912-38589731da69 h1:LnTXY9Akksk/aAmbebKIaC0doqk1aKbZQA3OoAd0BB0=
-k8s.io/client-go v0.0.0-20230315061912-38589731da69/go.mod h1:b0alWGtfu+BI7XZwwdOHJIsr7aDjKf3ANThw8Sr+tw8=
-k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8 h1:abwWEXGDfIhE8v3zs0nSO11/ec+uYCftqHkArBqozaU=
-k8s.io/code-generator v0.0.0-20230315053024-8fead9f64de8/go.mod h1:iWtpm0ZMG6Gc4daWfITDSIu+WFhFJArYDhj242zcbnY=
-k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0 h1:IjneP02MOB07PIP9+PQjKrOIZEZ5T7umR+GIZkU4h0U=
-k8s.io/component-base v0.0.0-20230315065615-6b9bb8ecc3d0/go.mod h1:kTuptveA6tUMLMKnaq4AbIAAk7IcdhwkbljAV3JZRpM=
+k8s.io/apiserver v0.0.0-20230322010019-45f55ded302a h1:6g+5Sg3q/SP8bvXC/gcRU4aU3WTc/SP6r/jbSmoqAP8=
+k8s.io/apiserver v0.0.0-20230322010019-45f55ded302a/go.mod h1:nbNcTaE0Dk2eJ+SbWfyZHKtwYB/t8yvJdIHG8x7WWpY=
+k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c h1:29TaJLdOV+6YadAIsdLLH5ImjgMWTuEm3a/COrgIGoI=
+k8s.io/client-go v0.0.0-20230317001143-1517ffb8d37c/go.mod h1:+yf0C0ynOsv3GhBRexl/5CJzyS/uxZJ1Gtn6N5GuVmc=
+k8s.io/code-generator v0.0.0-20230325021128-1e0c52da823a h1:MjyOi/5LEw178f67AzjInA72s5kLNJfb4LsWAx7Qin8=
+k8s.io/code-generator v0.0.0-20230325021128-1e0c52da823a/go.mod h1:iWtpm0ZMG6Gc4daWfITDSIu+WFhFJArYDhj242zcbnY=
+k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c h1:Sqi30xPpSoyhAgVj6IxQiRGeC+VdzSDU2ZasbS0TV1A=
+k8s.io/component-base v0.0.0-20230325023505-4d24bb3c2a3c/go.mod h1:kTuptveA6tUMLMKnaq4AbIAAk7IcdhwkbljAV3JZRpM=
 k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
 k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

pkg/apiserver/apiserver.go

@@ -397,7 +397,9 @@ func (s *APIAggregator) PrepareRun() (preparedAPIAggregator, error) {
 
 	if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.AggregatedDiscoveryEndpoint) {
 		s.discoveryAggregationController = NewDiscoveryManager(
-			s.GenericAPIServer.AggregatedDiscoveryGroupManager,
+			// Use aggregator as the source name to avoid overwriting native/CRD
+			// groups
+			s.GenericAPIServer.AggregatedDiscoveryGroupManager.WithSource(aggregated.AggregatorSource),
 		)
 
 		// Setup discovery endpoint

pkg/apiserver/handler_discovery.go

@@ -421,7 +421,7 @@ func (dm *discoveryManager) Run(stopCh <-chan struct{}) {
 	}
 
 	// Ensure that apiregistration.k8s.io is the first group in the discovery group.
-	dm.mergedDiscoveryHandler.SetGroupVersionPriority(APIRegistrationGroupVersion, APIRegistrationGroupPriority, 0)
+	dm.mergedDiscoveryHandler.WithSource(discoveryendpoint.BuiltinSource).SetGroupVersionPriority(APIRegistrationGroupVersion, APIRegistrationGroupPriority, 0)
 
 	wait.PollUntil(1*time.Minute, func() (done bool, err error) {
 		dm.servicesLock.Lock()