Merge pull request kcp-dev#3276 from mjudeikis/mjudeikis/clean.code

kcp-ci-bot · web-flow · commit 75281c7f70f4 · 2025-01-27T19:01:58.000+01:00
🌱 Noop: Clean code and organize imports
diff --git a/cmd/cache-server/main.go b/cmd/cache-server/main.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/component-base/cli"
 
@@ -75,7 +75,7 @@ func main() {
 				return err
 			}
 			if errs := completed.Validate(); len(errs) > 0 {
-				return errors.NewAggregate(errs)
+				return utilerrors.NewAggregate(errs)
 			}
 
 			config, err := cacheserver.NewConfig(completed, nil)
diff --git a/cmd/kcp-front-proxy/main.go b/cmd/kcp-front-proxy/main.go
@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/component-base/cli"
 	utilflag "k8s.io/component-base/cli/flag"
@@ -66,7 +66,7 @@ routed based on paths.`,
 				return err
 			}
 			if errs := options.Validate(); errs != nil {
-				return errors.NewAggregate(errs)
+				return utilerrors.NewAggregate(errs)
 			}
 
 			if options.Proxy.ProfilerAddress != "" {
diff --git a/cmd/kcp/kcp.go b/cmd/kcp/kcp.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/client-go/rest"
 	"k8s.io/component-base/cli"
@@ -119,7 +119,7 @@ func main() {
 			}
 
 			if errs := completedKcpOptions.Validate(); len(errs) > 0 {
-				return errors.NewAggregate(errs)
+				return utilerrors.NewAggregate(errs)
 			}
 
 			logger := klog.FromContext(cmd.Context())
diff --git a/cmd/sharded-test-server/main.go b/cmd/sharded-test-server/main.go
@@ -320,7 +320,7 @@ func start(proxyFlags, shardFlags []string, logDirPath, workDirPath string, numb
 		if i >= len(regions) {
 			break
 		}
-		patch := fmt.Sprintf(`{"metadata":{"labels":{"region":%q}}}`, regions[i])
+		patch := fmt.Sprintf(`{"metadata":{"labels":{"region":%q,"shared": "true"}}}`, regions[i])
 		if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 			_, err := client.Cluster(core.RootCluster.Path()).CoreV1alpha1().Shards().Patch(ctx, name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
 			return err
diff --git a/config/crds/bootstrap.go b/config/crds/bootstrap.go
@@ -31,7 +31,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
@@ -73,7 +73,7 @@ func CreateFromFS(ctx context.Context, client apiextensionsv1client.CustomResour
 	for err := range bootstrapErrChan {
 		bootstrapErrors = append(bootstrapErrors, err)
 	}
-	if err := kerrors.NewAggregate(bootstrapErrors); err != nil {
+	if err := utilerrors.NewAggregate(bootstrapErrors); err != nil {
 		return fmt.Errorf("could not bootstrap CRDs: %w", err)
 	}
 	return nil
diff --git a/config/helpers/bootstrap.go b/config/helpers/bootstrap.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	apimachineryerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	kubeyaml "k8s.io/apimachinery/pkg/util/yaml"
@@ -114,7 +114,7 @@ func CreateResourcesFromFS(ctx context.Context, client dynamic.Interface, mapper
 			errs = append(errs, err)
 		}
 	}
-	return apimachineryerrors.NewAggregate(errs)
+	return utilerrors.NewAggregate(errs)
 }
 
 // CreateResourceFromFS creates given resource file.
@@ -152,7 +152,7 @@ func CreateResourceFromFS(ctx context.Context, client dynamic.Interface, mapper
 			errs = append(errs, fmt.Errorf("failed to create resource %s doc %d: %w", filename, i, err))
 		}
 	}
-	return apimachineryerrors.NewAggregate(errs)
+	return utilerrors.NewAggregate(errs)
 }
 
 const annotationCreateOnlyKey = "bootstrap.kcp.io/create-only"
diff --git a/pkg/crdpuller/discovery.go b/pkg/crdpuller/discovery.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/endpoints/openapi"
 	"k8s.io/client-go/discovery"
@@ -232,7 +232,7 @@ func (sp *schemaPuller) PullCRDs(ctx context.Context, resourceNames ...string) (
 				}
 				protoSchema.Accept(converter)
 				if len(*converter.errors) > 0 {
-					logger.Error(kerrors.NewAggregate(*converter.errors), "error during the OpenAPI schema import of resource")
+					logger.Error(utilerrors.NewAggregate(*converter.errors), "error during the OpenAPI schema import of resource")
 					continue
 				}
 			}
diff --git a/pkg/reconciler/apis/apibinding/apibinding_reconcile.go b/pkg/reconciler/apis/apibinding/apibinding_reconcile.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apiserver"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	utilserrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 
@@ -77,7 +77,7 @@ func (c *controller) reconcile(ctx context.Context, apiBinding *apisv1alpha1.API
 		}
 	}
 
-	return requeue, utilserrors.NewAggregate(errs)
+	return requeue, utilerrors.NewAggregate(errs)
 }
 
 type summaryReconciler struct {
diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	aggregateerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/endpoints/handlers"
 	"k8s.io/klog/v2"
@@ -195,7 +195,7 @@ func (c *controller) reconcile(ctx context.Context, apiBinding *apisv1alpha1.API
 		if i > 10 {
 			i = 10
 		}
-		errsToDisplay := aggregateerrors.NewAggregate(unexpectedOrInvalidErrors[0:i])
+		errsToDisplay := utilerrors.NewAggregate(unexpectedOrInvalidErrors[0:i])
 
 		conditions.MarkFalse(
 			apiBinding,
@@ -224,7 +224,7 @@ func (c *controller) reconcile(ctx context.Context, apiBinding *apisv1alpha1.API
 		if i > 10 {
 			i = 10
 		}
-		errsToDisplay := aggregateerrors.NewAggregate(allErrs[0:i])
+		errsToDisplay := utilerrors.NewAggregate(allErrs[0:i])
 
 		conditions.MarkFalse(
 			apiBinding,
diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go
@@ -19,7 +19,7 @@ package logicalcluster
 import (
 	"context"
 
-	utilserrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 )
@@ -58,5 +58,5 @@ func (c *Controller) reconcile(ctx context.Context, logicalCluster *corev1alpha1
 		}
 	}
 
-	return requeue, utilserrors.NewAggregate(errs)
+	return requeue, utilerrors.NewAggregate(errs)
 }
diff --git a/pkg/reconciler/tenancy/workspacemounts/workspacemounts_reconcile.go b/pkg/reconciler/tenancy/workspacemounts/workspacemounts_reconcile.go
@@ -25,7 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	utilserrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 
 	tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
 )
@@ -81,5 +81,5 @@ func (c *Controller) reconcile(ctx context.Context, ws *tenancyv1alpha1.Workspac
 		}
 	}
 
-	return requeue, utilserrors.NewAggregate(errs)
+	return requeue, utilerrors.NewAggregate(errs)
 }
diff --git a/pkg/server/bootstrap/identity.go b/pkg/server/bootstrap/identity.go
@@ -31,7 +31,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	errorsutil "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
 
@@ -194,7 +194,7 @@ func wildcardIdentitiesResolver(ids *identities,
 
 			logger.V(4).Info("APIExport has identity")
 		}
-		return errorsutil.NewAggregate(errs)
+		return utilerrors.NewAggregate(errs)
 	}
 }
 
diff --git a/pkg/server/controllers.go b/pkg/server/controllers.go
@@ -1533,40 +1533,52 @@ func (s *Server) WaitForSync(stop <-chan struct{}) error {
 
 // addIndexerstoInformers is separated out from controllers as the re-election calls for controller re-initialization,
 // it would panics in indexer addition to informers as they are already started at bootup.
-func (s *Server) addIndexersToInformers(ctx context.Context) map[schema.GroupVersionResource]replication.ReplicatedGVR {
-	permissionclaimlabel.InstallIndexers(s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports(), s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings())
-	permissionclaimlabler.InstallIndexers(s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports())
+func (s *Server) addIndexersToInformers(_ context.Context) map[schema.GroupVersionResource]replication.ReplicatedGVR {
+	permissionclaimlabel.InstallIndexers(
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings(),
+	)
+	permissionclaimlabler.InstallIndexers(
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports())
 	apibinding.InstallIndexers(
 		s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings(),
 		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
-		s.CacheKcpSharedInformerFactory.Apis().V1alpha1().APIExports())
-	apiexport.InstallIndexers(s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports())
-	apiexportendpointslice.InstallIndexers(s.CacheKcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
-		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExportEndpointSlices())
-	labelclusterrolebindings.InstallIndexers(s.KubeSharedInformerFactory.Rbac().V1().ClusterRoleBindings())
-	labelclusterroles.InstallIndexers(s.KubeSharedInformerFactory.Rbac().V1().ClusterRoleBindings())
-	workspace.InstallIndexers(s.KcpSharedInformerFactory.Tenancy().V1alpha1().Workspaces(),
+		s.CacheKcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
+	)
+	apiexport.InstallIndexers(
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports())
+	apiexportendpointslice.InstallIndexers(
+		s.CacheKcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExportEndpointSlices(),
+	)
+	labelclusterrolebindings.InstallIndexers(
+		s.KubeSharedInformerFactory.Rbac().V1().ClusterRoleBindings(),
+	)
+	labelclusterroles.InstallIndexers(
+		s.KubeSharedInformerFactory.Rbac().V1().ClusterRoleBindings(),
+	)
+	workspace.InstallIndexers(
+		s.KcpSharedInformerFactory.Tenancy().V1alpha1().Workspaces(),
 		s.CacheKcpSharedInformerFactory.Core().V1alpha1().Shards(),
-		s.CacheKcpSharedInformerFactory.Tenancy().V1alpha1().WorkspaceTypes())
-	workspacemounts.InstallIndexers(s.KcpSharedInformerFactory.Tenancy().V1alpha1().Workspaces())
-
+		s.CacheKcpSharedInformerFactory.Tenancy().V1alpha1().WorkspaceTypes(),
+	)
+	workspacemounts.InstallIndexers(
+		s.KcpSharedInformerFactory.Tenancy().V1alpha1().Workspaces(),
+	)
 	extraannotationsync.InstallIndexers(
 		s.KcpSharedInformerFactory.Apis().V1alpha1().APIExports(),
-		s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings())
-
-	// Replicationcontroller indexers
-	localKcpInformers := s.KcpSharedInformerFactory
-	globalKcpInformers := s.CacheKcpSharedInformerFactory
-	localKubeInformers := s.KubeSharedInformerFactory
-	globalKubeInformers := s.CacheKubeSharedInformerFactory
-
-	gvrs := replication.InstallIndexers(localKcpInformers,
-		globalKcpInformers, localKubeInformers,
-		globalKubeInformers)
-
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings(),
+	)
 	initialization.InstallIndexers(
 		s.KcpSharedInformerFactory.Tenancy().V1alpha1().WorkspaceTypes(),
 		s.CacheKcpSharedInformerFactory.Tenancy().V1alpha1().WorkspaceTypes())
-	crdcleanup.InstallIndexers(s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings())
-	return gvrs
+	crdcleanup.InstallIndexers(
+		s.KcpSharedInformerFactory.Apis().V1alpha1().APIBindings(),
+	)
+	return replication.InstallIndexers(
+		s.KcpSharedInformerFactory,
+		s.CacheKcpSharedInformerFactory,
+		s.KubeSharedInformerFactory,
+		s.CacheKubeSharedInformerFactory,
+	)
 }
diff --git a/pkg/virtual/framework/internalapis/import.go b/pkg/virtual/framework/internalapis/import.go
@@ -23,7 +23,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	endpointsopenapi "k8s.io/apiserver/pkg/endpoints/openapi"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/util/openapi"
@@ -82,7 +82,7 @@ func CreateAPIResourceSchemas(schemes []*runtime.Scheme, openAPIDefinitionsGette
 		var schemaProps apiextensionsv1.JSONSchemaProps
 		errs := crdpuller.Convert(modelsByGKV[gvk], &schemaProps)
 		if len(errs) > 0 {
-			return nil, errors.NewAggregate(errs)
+			return nil, utilerrors.NewAggregate(errs)
 		}
 		group := def.GroupVersion.Group
 		if group == "" {
diff --git a/sdk/apis/apis/v1alpha1/crd_to_apiresourceschema.go b/sdk/apis/apis/v1alpha1/crd_to_apiresourceschema.go
@@ -21,7 +21,7 @@ import (
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
@@ -38,7 +38,7 @@ func CRDToAPIResourceSchema(crd *apiextensionsv1.CustomResourceDefinition, prefi
 			errs = append(errs, field.Invalid(field.NewPath("metadata", "name"), name, msg))
 		}
 
-		return nil, errors.NewAggregate(errs)
+		return nil, utilerrors.NewAggregate(errs)
 	}
 
 	apiResourceSchema := &APIResourceSchema{
diff --git a/test/e2e/framework/expect.go b/test/e2e/framework/expect.go
@@ -27,7 +27,7 @@ import (
 	"github.com/google/uuid"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	kerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
 
@@ -180,7 +180,7 @@ func (c *ExpectationController) ExpectBefore(ctx context.Context, expectation Ex
 	for {
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("expected state not found: %w, %d errors encountered while processing %d events: %v", ctx.Err(), len(expectationErrors), processed, kerrors.NewAggregate(expectationErrors))
+			return fmt.Errorf("expected state not found: %w, %d errors encountered while processing %d events: %v", ctx.Err(), len(expectationErrors), processed, utilerrors.NewAggregate(expectationErrors))
 		case result := <-results:
 			processed++
 			if result.err != nil {
@@ -190,7 +190,7 @@ func (c *ExpectationController) ExpectBefore(ctx context.Context, expectation Ex
 				if result.err == nil {
 					return nil
 				}
-				return kerrors.NewAggregate(expectationErrors)
+				return utilerrors.NewAggregate(expectationErrors)
 			}
 		}
 	}
diff --git a/test/e2e/framework/kcp.go b/test/e2e/framework/kcp.go
@@ -43,7 +43,7 @@ import (
 	gopkgyaml "gopkg.in/yaml.v3"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	apierrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -648,7 +648,7 @@ func (c *kcpServer) Run(opts ...RunOption) error {
 		}
 		if errs := completed.Validate(); len(errs) > 0 {
 			cleanup()
-			return apierrors.NewAggregate(errs)
+			return utilerrors.NewAggregate(errs)
 		}
 
 		config, err := server.NewConfig(ctx, completed.Server)
diff --git a/test/e2e/reconciler/cache/helpers.go b/test/e2e/reconciler/cache/helpers.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	apimachineryerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
 	kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
@@ -65,7 +65,7 @@ func StartStandaloneCacheServer(ctx context.Context, t *testing.T, dataDir strin
 	cacheServerCompletedOptions, err := cacheServerOptions.Complete()
 	require.NoError(t, err)
 	if errs := cacheServerCompletedOptions.Validate(); len(errs) > 0 {
-		require.NoError(t, apimachineryerrors.NewAggregate(errs))
+		require.NoError(t, utilerrors.NewAggregate(errs))
 	}
 	cacheServerConfig, err := cacheserver.NewConfig(cacheServerCompletedOptions, nil)
 	require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`"github.com/spf13/cobra"`
`25`	`25`
`26`		`- "k8s.io/apimachinery/pkg/util/errors"`
	`26`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`27`	`27`	`genericapiserver "k8s.io/apiserver/pkg/server"`
`28`	`28`	`"k8s.io/component-base/cli"`
`29`	`29`
`@@ -75,7 +75,7 @@ func main() {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`	`if errs := completed.Validate(); len(errs) > 0 {`
`78`		`- return errors.NewAggregate(errs)`
	`78`	`+ return utilerrors.NewAggregate(errs)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`config, err := cacheserver.NewConfig(completed, nil)`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ func start(proxyFlags, shardFlags []string, logDirPath, workDirPath string, numb`
`320`	`320`	`if i >= len(regions) {`
`321`	`321`	`break`
`322`	`322`	`}`
`323`		- patch := fmt.Sprintf(`{"metadata":{"labels":{"region":%q}}}`, regions[i])
	`323`	+ patch := fmt.Sprintf(`{"metadata":{"labels":{"region":%q,"shared": "true"}}}`, regions[i])
`324`	`324`	`if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {`
`325`	`325`	`_, err := client.Cluster(core.RootCluster.Path()).CoreV1alpha1().Shards().Patch(ctx, name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})`
`326`	`326`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`"k8s.io/apimachinery/pkg/api/meta"`
`34`	`34`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`35`	`35`	`"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"`
`36`		`- apimachineryerrors "k8s.io/apimachinery/pkg/util/errors"`
	`36`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`37`	`37`	`"k8s.io/apimachinery/pkg/util/sets"`
`38`	`38`	`"k8s.io/apimachinery/pkg/util/wait"`
`39`	`39`	`kubeyaml "k8s.io/apimachinery/pkg/util/yaml"`
`@@ -114,7 +114,7 @@ func CreateResourcesFromFS(ctx context.Context, client dynamic.Interface, mapper`
`114`	`114`	`errs = append(errs, err)`
`115`	`115`	`}`
`116`	`116`	`}`
`117`		`- return apimachineryerrors.NewAggregate(errs)`
	`117`	`+ return utilerrors.NewAggregate(errs)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// CreateResourceFromFS creates given resource file.`
`@@ -152,7 +152,7 @@ func CreateResourceFromFS(ctx context.Context, client dynamic.Interface, mapper`
`152`	`152`	`errs = append(errs, fmt.Errorf("failed to create resource %s doc %d: %w", filename, i, err))`
`153`	`153`	`}`
`154`	`154`	`}`
`155`		`- return apimachineryerrors.NewAggregate(errs)`
	`155`	`+ return utilerrors.NewAggregate(errs)`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`const annotationCreateOnlyKey = "bootstrap.kcp.io/create-only"`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`"k8s.io/apimachinery/pkg/api/errors"`
`35`	`35`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`36`	`36`	`"k8s.io/apimachinery/pkg/runtime/schema"`
`37`		`- kerrors "k8s.io/apimachinery/pkg/util/errors"`
	`37`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`38`	`38`	`"k8s.io/apimachinery/pkg/util/sets"`
`39`	`39`	`"k8s.io/apiserver/pkg/endpoints/openapi"`
`40`	`40`	`"k8s.io/client-go/discovery"`
`@@ -232,7 +232,7 @@ func (sp *schemaPuller) PullCRDs(ctx context.Context, resourceNames ...string) (`
`232`	`232`	`}`
`233`	`233`	`protoSchema.Accept(converter)`
`234`	`234`	`if len(*converter.errors) > 0 {`
`235`		`- logger.Error(kerrors.NewAggregate(*converter.errors), "error during the OpenAPI schema import of resource")`
	`235`	`+ logger.Error(utilerrors.NewAggregate(*converter.errors), "error during the OpenAPI schema import of resource")`
`236`	`236`	`continue`
`237`	`237`	`}`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"k8s.io/apiextensions-apiserver/pkg/apiserver"`
`32`	`32`	`apierrors "k8s.io/apimachinery/pkg/api/errors"`
`33`	`33`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`34`		`- utilserrors "k8s.io/apimachinery/pkg/util/errors"`
	`34`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`35`	`35`	`"k8s.io/apimachinery/pkg/util/sets"`
`36`	`36`	`"k8s.io/klog/v2"`
`37`	`37`
`@@ -77,7 +77,7 @@ func (c controller) reconcile(ctx context.Context, apiBinding apisv1alpha1.API`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- return requeue, utilserrors.NewAggregate(errs)`
	`80`	`+ return requeue, utilerrors.NewAggregate(errs)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`type summaryReconciler struct {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package logicalcluster`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`
`22`		`- utilserrors "k8s.io/apimachinery/pkg/util/errors"`
	`22`	`+ utilerrors "k8s.io/apimachinery/pkg/util/errors"`
`23`	`23`
`24`	`24`	`corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"`
`25`	`25`	`)`
`@@ -58,5 +58,5 @@ func (c Controller) reconcile(ctx context.Context, logicalCluster corev1alpha1`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- return requeue, utilserrors.NewAggregate(errs)`
	`61`	`+ return requeue, utilerrors.NewAggregate(errs)`
`62`	`62`	`}`