WIP: Rebase 1.32 Pre.1 Diff

pkg/controller/garbagecollector/garbagecollector_patch.go

@@ -32,32 +32,27 @@ import (
 	"k8s.io/kubernetes/pkg/controller/garbagecollector/metrics"
 )
 
-func (gc *GarbageCollector) ResyncMonitors(ctx context.Context, discoveryClient discovery.ServerResourcesInterface) {
+func (gc *GarbageCollector) ResyncMonitors(ctx context.Context, discoveryClient discovery.ServerResourcesInterface) error {
 	oldResources := make(map[schema.GroupVersionResource]struct{})
-	func() {
+	return func() error {
 		logger := klog.FromContext(ctx)
 
 		// Get the current resource list from discovery.
 		newResources, err := GetDeletableResources(logger, discoveryClient)
+		if err != nil {
+			return err
+		}
 
 		if len(newResources) == 0 {
 			logger.V(2).Info("no resources reported by discovery, skipping garbage collector sync")
 			metrics.GarbageCollectorResourcesSyncError.Inc()
-			return
-		}
-		if groupLookupFailures, isLookupFailure := discovery.GroupDiscoveryFailedErrorGroups(err); isLookupFailure {
-			// In partial discovery cases, preserve existing synced informers for resources in the failed groups, so resyncMonitors will only add informers for newly seen resources
-			for k, v := range oldResources {
-				if _, failed := groupLookupFailures[k.GroupVersion()]; failed && gc.dependencyGraphBuilder.IsResourceSynced(k) {
-					newResources[k] = v
-				}
-			}
+			return nil
 		}
 
 		// Decide whether discovery has reported a change.
 		if reflect.DeepEqual(oldResources, newResources) {
 			logger.V(5).Info("no resource updates from discovery, skipping garbage collector sync")
-			return
+			return nil
 		}
 
 		// Ensure workers are paused to avoid processing events before informers
@@ -73,20 +68,14 @@ func (gc *GarbageCollector) ResyncMonitors(ctx context.Context, discoveryClient
 			// On a reattempt, check if available resources have changed
 			if attempt > 1 {
 				newResources, err = GetDeletableResources(logger, discoveryClient)
-
+				if err != nil {
+					return false, err
+				}
 				if len(newResources) == 0 {
 					logger.V(2).Info("no resources reported by discovery", "attempt", attempt)
 					metrics.GarbageCollectorResourcesSyncError.Inc()
 					return false, nil
 				}
-				if groupLookupFailures, isLookupFailure := discovery.GroupDiscoveryFailedErrorGroups(err); isLookupFailure {
-					// In partial discovery cases, preserve existing synced informers for resources in the failed groups, so resyncMonitors will only add informers for newly seen resources
-					for k, v := range oldResources {
-						if _, failed := groupLookupFailures[k.GroupVersion()]; failed && gc.dependencyGraphBuilder.IsResourceSynced(k) {
-							newResources[k] = v
-						}
-					}
-				}
 			}
 
 			logger.V(2).Info(
@@ -139,5 +128,7 @@ func (gc *GarbageCollector) ResyncMonitors(ctx context.Context, discoveryClient
 		// subsequent runs should stop them if their resources were removed.
 		oldResources = newResources
 		logger.V(2).Info("synced garbage collector")
+
+		return nil
 	}()
 }

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler_test.go

@@ -510,7 +510,7 @@ func testHandlerConversion(t *testing.T, enableWatchCache bool) {
 		&noneConverterFactory{},
 		1,
 		dummyAuthorizerImpl{},
-		time.Minute, time.Minute, nil, 3*1024*1024)
+		time.Minute, time.Minute, nil, 3*1024*1024, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1035,7 +1035,7 @@ func TestBuildOpenAPIModelsForApply(t *testing.T) {
 
 	for i, test := range tests {
 		crd.Spec.Versions[0].Schema = &test
-		models, err := buildOpenAPIModelsForApply(convertedDefs, &crd)
+		models, err := buildOpenAPIModelsForApply(convertedDefs, &crd, true)
 		if err != nil {
 			t.Fatalf("failed to convert to apply model: %v", err)
 		}

staging/src/k8s.io/apiserver/pkg/server/options/admission.go

@@ -19,14 +19,12 @@ package options
 import (
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/spf13/pflag"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
-	utilwait "k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/admission/initializer"
 	admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
@@ -39,11 +37,9 @@ import (
 	apiserverapiv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
 	apiserverapiv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1"
 	"k8s.io/apiserver/pkg/server"
-	cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/restmapper"
 	"k8s.io/component-base/featuregate"
 )
 
@@ -151,24 +147,11 @@ func (a *AdmissionOptions) ApplyTo(
 		return fmt.Errorf("failed to read plugin config: %v", err)
 	}
 
-	discoveryClient := cacheddiscovery.NewMemCacheClient(kubeClient.Discovery())
-	discoveryRESTMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
 	genericInitializer := initializer.New(kubeClient, dynamicClient, informers, c.Authorization.Authorizer, features,
-		c.DrainedNotify(), discoveryRESTMapper)
+		c.DrainedNotify(), nil)
 	initializersChain := admission.PluginInitializers{genericInitializer}
 	initializersChain = append(initializersChain, pluginInitializers...)
 
-	admissionPostStartHook := func(hookContext server.PostStartHookContext) error {
-		discoveryRESTMapper.Reset()
-		go utilwait.Until(discoveryRESTMapper.Reset, 30*time.Second, hookContext.Done())
-		return nil
-	}
-
-	err = c.AddPostStartHook("start-apiserver-admission-initializer", admissionPostStartHook)
-	if err != nil {
-		return fmt.Errorf("failed to add post start hook for policy admission: %w", err)
-	}
-
 	admissionChain, err := a.Plugins.NewFromPlugins(pluginNames, pluginsConfigProvider, initializersChain, a.Decorators)
 	if err != nil {
 		return err

staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch_test.go

@@ -37,7 +37,7 @@ func TestCreateClusterAwareContext(t *testing.T) {
 		{
 			name:            "scoped, built-in type",
 			existingObject:  makePod("pod1", "root:org:abc", "default"),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 		{
 			name: "cluster wide, built-in type",
@@ -46,28 +46,28 @@ func TestCreateClusterAwareContext(t *testing.T) {
 				p.Namespace = ""
 				return p
 			}(),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 		{
 			name:            "scoped, identity, built-in type",
 			existingObject:  makePod("pod1", "root:org:abc", "default"),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 
 		{
 			name:            "scoped, unstructured type",
 			existingObject:  makeUnstructured("root:org:abc", "default"),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 		{
 			name:            "cluster wide, unstructured type",
 			existingObject:  makeUnstructured("root:org:abc", ""),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 		{
 			name:            "scoped, identity, unstructured type",
 			existingObject:  makeUnstructured("root:org:abc", "default"),
-			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.New("root:org:abc")},
+			expectedCluster: genericapirequest.Cluster{Name: logicalcluster.Name("root:org:abc")},
 		},
 	}