Skip to content

Commit 9c5ae40

Browse files
authored
CON-9194 Update Go dependencies for k8s 1.27.1 (#621)
* CON-9194 Update Go dependencies for k8s 1.27.1 * CON-9194 Fix main.go --------- Co-authored-by: Oliver Love <[email protected]>
1 parent 5ad9a73 commit 9c5ae40

File tree

1,270 files changed

+68117
-32943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,270 files changed

+68117
-32943
lines changed

cloud-controller-manager/cmd/digitalocean-webhook-server/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ package main
1818

1919
import (
2020
"fmt"
21-
"os"
22-
2321
"k8s.io/apimachinery/pkg/runtime"
22+
"os"
2423
ctrl "sigs.k8s.io/controller-runtime"
2524
"sigs.k8s.io/controller-runtime/pkg/client"
25+
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
2626
"sigs.k8s.io/controller-runtime/pkg/webhook"
2727

2828
"github.com/digitalocean/digitalocean-cloud-controller-manager/cloud-controller-manager/do"
@@ -47,15 +47,15 @@ func startWebhookServer() error {
4747
if err != nil {
4848
fmt.Fprintf(os.Stderr, "failed to retrieve kubeconfig %v\n", err)
4949
}
50-
server := webhook.Server{}
50+
server := webhook.NewServer(webhook.Options{})
5151
c, err := client.New(config, client.Options{Scheme: scheme})
5252
if err != nil {
5353
fmt.Fprintf(os.Stderr, "failed to construct cr client %v\n", err)
5454
}
5555

5656
server.Register("/validate-doks-lb-service", &webhook.Admission{Handler: &do.DOKSLBServiceValidator{Client: c, Log: ll}})
5757
ll.Info("Registering Webhook server handlers")
58-
if err = server.StartStandalone(ctrl.SetupSignalHandler(), scheme); err != nil {
58+
if err = server.Start(signals.SetupSignalHandler()); err != nil {
5959
return err
6060
}
6161
ll.Info("Webhooks server started")

go.mod

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,44 @@ require (
1010
github.com/minio/minio-go v6.0.14+incompatible
1111
github.com/mitchellh/copystructure v1.2.0
1212
github.com/pkg/errors v0.9.1
13-
github.com/prometheus/client_golang v1.14.0
13+
github.com/prometheus/client_golang v1.15.1
1414
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
15-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
15+
golang.org/x/oauth2 v0.8.0
1616
golang.org/x/sync v0.2.0
17-
k8s.io/api v0.26.3
18-
k8s.io/apimachinery v0.26.3
19-
k8s.io/client-go v0.26.3
20-
k8s.io/cloud-provider v0.26.3
21-
k8s.io/component-base v0.26.3
17+
k8s.io/api v0.27.2
18+
k8s.io/apimachinery v0.27.2
19+
k8s.io/client-go v0.27.2
20+
k8s.io/cloud-provider v0.27.2
21+
k8s.io/component-base v0.27.2
2222
k8s.io/klog/v2 v2.100.1
23-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
24-
sigs.k8s.io/controller-runtime v0.14.6
23+
k8s.io/utils v0.0.0-20230505201702-9f6742963106
24+
sigs.k8s.io/controller-runtime v0.15.0
2525
)
2626

2727
require (
2828
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2929
github.com/NYTimes/gziphandler v1.1.1 // indirect
3030
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
31+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3132
github.com/beorn7/perks v1.0.1 // indirect
3233
github.com/blang/semver/v4 v4.0.0 // indirect
3334
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
34-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
35+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3536
github.com/coreos/go-semver v0.3.0 // indirect
36-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
37+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
3738
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3839
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3940
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4041
github.com/felixge/httpsnoop v1.0.3 // indirect
4142
github.com/fsnotify/fsnotify v1.6.0 // indirect
4243
github.com/go-ini/ini v1.39.0 // indirect
4344
github.com/go-logr/stdr v1.2.2 // indirect
44-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
45-
github.com/go-openapi/jsonreference v0.20.0 // indirect
46-
github.com/go-openapi/swag v0.19.14 // indirect
45+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonreference v0.20.1 // indirect
47+
github.com/go-openapi/swag v0.22.3 // indirect
4748
github.com/gogo/protobuf v1.3.2 // indirect
4849
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
49-
github.com/golang/protobuf v1.5.2 // indirect
50+
github.com/golang/protobuf v1.5.3 // indirect
5051
github.com/google/cel-go v0.12.6 // indirect
5152
github.com/google/gnostic v0.5.7-v3refs // indirect
5253
github.com/google/go-querystring v1.1.0 // indirect
@@ -58,26 +59,27 @@ require (
5859
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5960
github.com/josharian/intern v1.0.0 // indirect
6061
github.com/json-iterator/go v1.1.12 // indirect
61-
github.com/mailru/easyjson v0.7.6 // indirect
62-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
62+
github.com/mailru/easyjson v0.7.7 // indirect
63+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6364
github.com/mitchellh/go-homedir v1.1.0 // indirect
65+
github.com/mitchellh/mapstructure v1.4.1 // indirect
6466
github.com/mitchellh/reflectwalk v1.0.2 // indirect
65-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
67+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6668
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6769
github.com/modern-go/reflect2 v1.0.2 // indirect
6870
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69-
github.com/prometheus/client_model v0.3.0 // indirect
70-
github.com/prometheus/common v0.37.0 // indirect
71-
github.com/prometheus/procfs v0.8.0 // indirect
71+
github.com/prometheus/client_model v0.4.0 // indirect
72+
github.com/prometheus/common v0.42.0 // indirect
73+
github.com/prometheus/procfs v0.9.0 // indirect
7274
github.com/smartystreets/goconvey v1.7.2 // indirect
7375
github.com/spf13/cobra v1.6.0 // indirect
7476
github.com/spf13/pflag v1.0.5 // indirect
7577
github.com/stoewer/go-strcase v1.2.0 // indirect
76-
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
77-
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
78-
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
78+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
79+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
80+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
7981
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
80-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
82+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
8183
go.opentelemetry.io/otel v1.10.0 // indirect
8284
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
8385
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -90,30 +92,30 @@ require (
9092
go.uber.org/multierr v1.6.0 // indirect
9193
go.uber.org/zap v1.24.0 // indirect
9294
golang.org/x/crypto v0.1.0 // indirect
93-
golang.org/x/net v0.7.0 // indirect
94-
golang.org/x/sys v0.5.0 // indirect
95-
golang.org/x/term v0.5.0 // indirect
96-
golang.org/x/text v0.7.0 // indirect
95+
golang.org/x/net v0.10.0 // indirect
96+
golang.org/x/sys v0.8.0 // indirect
97+
golang.org/x/term v0.8.0 // indirect
98+
golang.org/x/text v0.9.0 // indirect
9799
golang.org/x/time v0.3.0 // indirect
98-
golang.org/x/tools v0.2.0 // indirect
99-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
100+
golang.org/x/tools v0.9.1 // indirect
101+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
100102
google.golang.org/appengine v1.6.7 // indirect
101-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
102-
google.golang.org/grpc v1.49.0 // indirect
103-
google.golang.org/protobuf v1.28.1 // indirect
103+
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
104+
google.golang.org/grpc v1.51.0 // indirect
105+
google.golang.org/protobuf v1.30.0 // indirect
104106
gopkg.in/inf.v0 v0.9.1 // indirect
105107
gopkg.in/ini.v1 v1.67.0 // indirect
106108
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
107109
gopkg.in/yaml.v2 v2.4.0 // indirect
108110
gopkg.in/yaml.v3 v3.0.1 // indirect
109-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
110-
k8s.io/apiserver v0.26.3 // indirect
111-
k8s.io/component-helpers v0.26.3 // indirect
112-
k8s.io/controller-manager v0.26.3 // indirect
113-
k8s.io/kms v0.26.3 // indirect
114-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
115-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
116-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
111+
k8s.io/apiextensions-apiserver v0.27.2 // indirect
112+
k8s.io/apiserver v0.27.2 // indirect
113+
k8s.io/component-helpers v0.27.2 // indirect
114+
k8s.io/controller-manager v0.27.2 // indirect
115+
k8s.io/kms v0.27.2 // indirect
116+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
117+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
118+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
117119
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
118120
sigs.k8s.io/yaml v1.3.0 // indirect
119121
)

0 commit comments

Comments
 (0)