updates kube dependencies

Also updates direct dependencies

Author: vroldanbet

e2e/e2e_test.go

@@ -63,6 +63,8 @@ var (
 	clientCA *ClientCA
 )
 
+const kubeVersionExpression = "~1.32.0"
+
 func TestEndToEnd(t *testing.T) {
 	RunSpecs(t, "proxy tests")
 }
@@ -156,10 +158,8 @@ func ConfigureApiserver() {
 
 	e := &env.Env{
 		Log: log,
-		Client: &remote.Client{
-			Log:    log,
-			Bucket: "kubebuilder-tools",
-			Server: "storage.googleapis.com",
+		Client: &remote.HTTPClient{
+			Log: log,
 		},
 		Version: versions.Spec{
 			Selector:    versions.TildeSelector{},
@@ -177,7 +177,8 @@ func ConfigureApiserver() {
 		Store: store.NewAt("../testbin"),
 		Out:   os.Stdout,
 	}
-	e.Version, err = versions.FromExpr("~1.27.0")
+
+	e.Version, err = versions.FromExpr(kubeVersionExpression)
 	Expect(err).To(Succeed())
 
 	workflows.Use{
@@ -209,7 +210,7 @@ func StartKubeGC(ctx context.Context, restConfig *rest.Config) {
 	metadataInformers := metadatainformer.NewSharedInformerFactory(mclient, 0)
 
 	started := make(chan struct{})
-	gcController, err := garbagecollector.NewGarbageCollector(kclient, mclient, mapper, nil, informerfactory.NewInformerFactory(sharedInformers, metadataInformers), started)
+	gcController, err := garbagecollector.NewGarbageCollector(ctx, kclient, mclient, mapper, nil, informerfactory.NewInformerFactory(sharedInformers, metadataInformers), started)
 	Expect(err).To(Succeed())
 
 	sharedInformers.Start(ctx.Done())
@@ -218,7 +219,7 @@ func StartKubeGC(ctx context.Context, restConfig *rest.Config) {
 	metadataInformers.WaitForCacheSync(ctx.Done())
 	close(started)
 
-	go gcController.Run(ctx, 1)
+	go gcController.Run(ctx, 1, 30*time.Second)
 	go gcController.Sync(ctx, cachedDiscovery, 30*time.Second)
 }
 

e2e/go.mod

@@ -31,6 +31,6 @@ func GetAllTuples(ctx context.Context, filter *v1.RelationshipFilter) []*v1.Read
 // of tuple strings.
 func RelRespToStrings(relResps []*v1.ReadRelationshipsResponse) []string {
 	return lo.Map(relResps, func(item *v1.ReadRelationshipsResponse, _ int) string {
-		return tuple.MustRelString(item.Relationship)
+		return tuple.MustV1RelString(item.Relationship)
 	})
 }

e2e/go.sum

@@ -19,9 +19,9 @@ const defaultLogLevel = slog.LevelDebug
 
 func SetupWithMemoryBackend(ctx context.Context, permissionClient v1.PermissionsServiceClient, kubeClient rest.Interface) (*client.Client, *Worker, error) {
 	ctx = klog.NewContext(ctx, klog.FromContext(ctx).WithValues("backend", "sqlite-memory"))
-	return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewInMemoryBackend(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+	return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewInMemoryBackend(sqlite.WithBackendOptions(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		Level: defaultLogLevel,
-	})))))
+	}))))))
 }
 
 func SetupWithSQLiteBackend(ctx context.Context, permissionClient v1.PermissionsServiceClient, kubeClient rest.Interface, sqlitePath string) (*client.Client, *Worker, error) {
@@ -30,9 +30,9 @@ func SetupWithSQLiteBackend(ctx context.Context, permissionClient v1.Permissions
 	}
 
 	ctx = klog.NewContext(ctx, klog.FromContext(ctx).WithValues("backend", "sqlite-file", "path", sqlitePath))
-	return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewSqliteBackend(sqlitePath, backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+	return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewSqliteBackend(sqlitePath, sqlite.WithBackendOptions(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		Level: defaultLogLevel,
-	})))))
+	}))))))
 }
 
 func SetupWithBackend(ctx context.Context, permissionClient v1.PermissionsServiceClient, kubeClient rest.Interface, backend backend.Backend) (*client.Client, *Worker, error) {
@@ -43,7 +43,7 @@ func SetupWithBackend(ctx context.Context, permissionClient v1.PermissionsServic
 	}
 
 	monoBackend := monoprocess.NewMonoprocessBackend(backend)
-	w := worker.New(monoBackend, &worker.DefaultWorkerOptions)
+	w := worker.New(monoBackend, &worker.DefaultOptions)
 
 	if err := w.RegisterWorkflow(PessimisticWriteToSpiceDBAndKube); err != nil {
 		return nil, nil, err

e2e/util_test.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
@@ -45,7 +46,7 @@ func (c *Authentication) serviceAccountAuthEnabled() bool {
 	return c.BuiltInOptions.ServiceAccounts != nil && len(c.BuiltInOptions.ServiceAccounts.KeyFiles) != 0
 }
 
-func (c *Authentication) ApplyTo(authenticationInfo *genericapiserver.AuthenticationInfo, servingInfo *genericapiserver.SecureServingInfo) error {
+func (c *Authentication) ApplyTo(ctx context.Context, authenticationInfo *genericapiserver.AuthenticationInfo, servingInfo *genericapiserver.SecureServingInfo) error {
 	authenticatorConfig, err := c.BuiltInOptions.ToAuthenticationConfig()
 	if err != nil {
 		return err
@@ -63,7 +64,7 @@ func (c *Authentication) ApplyTo(authenticationInfo *genericapiserver.Authentica
 
 	// TODO: ServiceAccounts
 
-	baseAuthenticator, _, err := authenticatorConfig.New()
+	baseAuthenticator, _, _, _, err := authenticatorConfig.New(ctx)
 	if err != nil {
 		return err
 	}

go.mod

@@ -2,7 +2,6 @@ package proxy
 
 import (
 	"k8s.io/apimachinery/pkg/util/runtime"
-	genericfeatures "k8s.io/apiserver/pkg/features"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/component-base/featuregate"
 	logsapi "k8s.io/component-base/logs/api/v1"
@@ -13,13 +12,6 @@ func init() {
 }
 
 var defaultGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	genericfeatures.APIResponseCompression:              {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.APIListChunking:                     {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.APIPriorityAndFairness:              {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.OpenAPIEnums:                        {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.ServerSideApply:                     {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29
-	genericfeatures.ValidatingAdmissionPolicy:           {Default: false, PreRelease: featuregate.Beta},
-	logsapi.LoggingBetaOptions:                          {Default: true, PreRelease: featuregate.Beta},
-	logsapi.ContextualLogging:                           {Default: true, PreRelease: featuregate.Alpha},
+	logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta},
+	logsapi.ContextualLogging:  {Default: true, PreRelease: featuregate.Alpha},
 }

go.sum

@@ -181,7 +181,7 @@ func (o *Options) Complete(ctx context.Context) error {
 	if err := o.SecureServing.ApplyTo(&o.ServingInfo, &loopbackClientConfig); err != nil {
 		return err
 	}
-	if err := o.Authentication.ApplyTo(&o.AuthenticationInfo, o.ServingInfo); err != nil {
+	if err := o.Authentication.ApplyTo(ctx, &o.AuthenticationInfo, o.ServingInfo); err != nil {
 		return err
 	}