Skip to content

Commit bee3983

Browse files
committed
updates kube dependencies
Also updates direct dependencies
1 parent b5089ba commit bee3983

File tree

8 files changed

+3300
-1000
lines changed

8 files changed

+3300
-1000
lines changed

e2e/go.mod

Lines changed: 203 additions & 160 deletions
Large diffs are not rendered by default.

e2e/go.sum

Lines changed: 1444 additions & 338 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 202 additions & 151 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 1440 additions & 333 deletions
Large diffs are not rendered by default.

pkg/authz/distributedtx/client.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const defaultLogLevel = slog.LevelDebug
1919

2020
func SetupWithMemoryBackend(ctx context.Context, permissionClient v1.PermissionsServiceClient, kubeClient rest.Interface) (*client.Client, *Worker, error) {
2121
ctx = klog.NewContext(ctx, klog.FromContext(ctx).WithValues("backend", "sqlite-memory"))
22-
return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewInMemoryBackend(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
22+
return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewInMemoryBackend(sqlite.WithBackendOptions(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
2323
Level: defaultLogLevel,
24-
})))))
24+
}))))))
2525
}
2626

2727
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
3030
}
3131

3232
ctx = klog.NewContext(ctx, klog.FromContext(ctx).WithValues("backend", "sqlite-file", "path", sqlitePath))
33-
return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewSqliteBackend(sqlitePath, backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
33+
return SetupWithBackend(ctx, permissionClient, kubeClient, sqlite.NewSqliteBackend(sqlitePath, sqlite.WithBackendOptions(backend.WithLogger(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
3434
Level: defaultLogLevel,
35-
})))))
35+
}))))))
3636
}
3737

3838
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
4343
}
4444

4545
monoBackend := monoprocess.NewMonoprocessBackend(backend)
46-
w := worker.New(monoBackend, &worker.DefaultWorkerOptions)
46+
w := worker.New(monoBackend, &worker.DefaultOptions)
4747

4848
if err := w.RegisterWorkflow(PessimisticWriteToSpiceDBAndKube); err != nil {
4949
return nil, nil, err

pkg/proxy/authn.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package proxy
22

33
import (
4+
"context"
45
"fmt"
56
"net/http"
67

@@ -45,7 +46,7 @@ func (c *Authentication) serviceAccountAuthEnabled() bool {
4546
return c.BuiltInOptions.ServiceAccounts != nil && len(c.BuiltInOptions.ServiceAccounts.KeyFiles) != 0
4647
}
4748

48-
func (c *Authentication) ApplyTo(authenticationInfo *genericapiserver.AuthenticationInfo, servingInfo *genericapiserver.SecureServingInfo) error {
49+
func (c *Authentication) ApplyTo(ctx context.Context, authenticationInfo *genericapiserver.AuthenticationInfo, servingInfo *genericapiserver.SecureServingInfo) error {
4950
authenticatorConfig, err := c.BuiltInOptions.ToAuthenticationConfig()
5051
if err != nil {
5152
return err
@@ -63,7 +64,7 @@ func (c *Authentication) ApplyTo(authenticationInfo *genericapiserver.Authentica
6364

6465
// TODO: ServiceAccounts
6566

66-
baseAuthenticator, _, err := authenticatorConfig.New()
67+
baseAuthenticator, _, _, _, err := authenticatorConfig.New(ctx)
6768
if err != nil {
6869
return err
6970
}

pkg/proxy/features.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package proxy
22

33
import (
44
"k8s.io/apimachinery/pkg/util/runtime"
5-
genericfeatures "k8s.io/apiserver/pkg/features"
65
utilfeature "k8s.io/apiserver/pkg/util/feature"
76
"k8s.io/component-base/featuregate"
87
logsapi "k8s.io/component-base/logs/api/v1"
@@ -13,13 +12,6 @@ func init() {
1312
}
1413

1514
var defaultGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
16-
genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
17-
genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.Beta},
18-
genericfeatures.APIPriorityAndFairness: {Default: true, PreRelease: featuregate.Beta},
19-
genericfeatures.CustomResourceValidationExpressions: {Default: true, PreRelease: featuregate.Beta},
20-
genericfeatures.OpenAPIEnums: {Default: true, PreRelease: featuregate.Beta},
21-
genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29
22-
genericfeatures.ValidatingAdmissionPolicy: {Default: false, PreRelease: featuregate.Beta},
23-
logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta},
24-
logsapi.ContextualLogging: {Default: true, PreRelease: featuregate.Alpha},
15+
logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta},
16+
logsapi.ContextualLogging: {Default: true, PreRelease: featuregate.Alpha},
2517
}

pkg/proxy/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (o *Options) Complete(ctx context.Context) error {
181181
if err := o.SecureServing.ApplyTo(&o.ServingInfo, &loopbackClientConfig); err != nil {
182182
return err
183183
}
184-
if err := o.Authentication.ApplyTo(&o.AuthenticationInfo, o.ServingInfo); err != nil {
184+
if err := o.Authentication.ApplyTo(ctx, &o.AuthenticationInfo, o.ServingInfo); err != nil {
185185
return err
186186
}
187187

0 commit comments

Comments
 (0)