Skip to content

Commit 9ff6b0b

Browse files
authored
Merge pull request #793 from MartinForReal/master
Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28
2 parents 4ce2aca + 469ba76 commit 9ff6b0b

File tree

2,078 files changed

+361663
-56125
lines changed

Some content is hidden

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

2,078 files changed

+361663
-56125
lines changed

go.mod

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,23 @@ require (
1717
github.com/onsi/ginkgo v1.16.5
1818
github.com/onsi/gomega v1.27.8
1919
github.com/pborman/uuid v1.2.1
20-
github.com/prometheus/client_model v0.3.0
21-
github.com/prometheus/common v0.37.0
22-
github.com/prometheus/procfs v0.8.0
20+
github.com/prometheus/client_model v0.4.0
21+
github.com/prometheus/common v0.44.0
22+
github.com/prometheus/procfs v0.10.1
2323
github.com/shirou/gopsutil v3.21.11+incompatible
2424
github.com/spf13/pflag v1.0.5
2525
github.com/stretchr/testify v1.8.4
2626
go.opencensus.io v0.24.0
27-
golang.org/x/crypto v0.10.0
27+
golang.org/x/crypto v0.11.0
2828
golang.org/x/oauth2 v0.9.0
29-
golang.org/x/sys v0.9.0
29+
golang.org/x/sys v0.10.0
3030
google.golang.org/api v0.114.0
31-
k8s.io/api v0.17.17
32-
k8s.io/apimachinery v0.17.17
33-
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
34-
k8s.io/component-base v0.17.2
31+
k8s.io/api v0.28.1
32+
k8s.io/apimachinery v0.28.1
33+
k8s.io/client-go v9.0.0+incompatible
34+
k8s.io/component-base v0.28.1
3535
k8s.io/klog v1.0.0
36+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
3637
sigs.k8s.io/boskos v0.0.0-20200515170311-7d36bde8cdf6
3738
)
3839

@@ -43,42 +44,50 @@ require (
4344
cloud.google.com/go/trace v1.9.0 // indirect
4445
github.com/aws/aws-sdk-go v1.35.24 // indirect
4546
github.com/beorn7/perks v1.0.1 // indirect
46-
github.com/blang/semver v3.5.1+incompatible // indirect
47+
github.com/blang/semver/v4 v4.0.0 // indirect
4748
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
4849
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4950
github.com/davecgh/go-spew v1.1.1 // indirect
51+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
5052
github.com/fsnotify/fsnotify v1.4.9 // indirect
53+
github.com/go-logr/logr v1.2.4 // indirect
5154
github.com/go-ole/go-ole v1.2.6 // indirect
55+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
56+
github.com/go-openapi/jsonreference v0.20.2 // indirect
57+
github.com/go-openapi/swag v0.22.3 // indirect
5258
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5359
github.com/gogo/protobuf v1.3.2 // indirect
5460
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5561
github.com/golang/protobuf v1.5.3 // indirect
62+
github.com/google/gnostic-models v0.6.8 // indirect
5663
github.com/google/go-cmp v0.5.9 // indirect
57-
github.com/google/gofuzz v1.1.0 // indirect
64+
github.com/google/gofuzz v1.2.0 // indirect
5865
github.com/google/uuid v1.3.0 // indirect
5966
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
6067
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
61-
github.com/googleapis/gnostic v0.3.1 // indirect
6268
github.com/hashicorp/errwrap v1.0.0 // indirect
6369
github.com/hashicorp/go-multierror v1.0.0 // indirect
6470
github.com/imdario/mergo v0.3.8 // indirect
6571
github.com/jmespath/go-jmespath v0.4.0 // indirect
72+
github.com/josharian/intern v1.0.0 // indirect
6673
github.com/json-iterator/go v1.1.12 // indirect
67-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
74+
github.com/mailru/easyjson v0.7.7 // indirect
75+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6876
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6977
github.com/modern-go/reflect2 v1.0.2 // indirect
78+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7079
github.com/nxadm/tail v1.4.8 // indirect
7180
github.com/pmezard/go-difflib v1.0.0 // indirect
72-
github.com/prometheus/client_golang v1.14.0 // indirect
81+
github.com/prometheus/client_golang v1.16.0 // indirect
7382
github.com/sirupsen/logrus v1.8.1 // indirect
7483
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 // indirect
7584
github.com/tklauser/go-sysconf v0.3.11 // indirect
7685
github.com/tklauser/numcpus v0.6.0 // indirect
7786
github.com/yusufpapurcu/wmi v1.2.3 // indirect
78-
golang.org/x/net v0.11.0 // indirect
87+
golang.org/x/net v0.13.0 // indirect
7988
golang.org/x/sync v0.3.0 // indirect
80-
golang.org/x/term v0.9.0 // indirect
81-
golang.org/x/text v0.10.0 // indirect
89+
golang.org/x/term v0.10.0 // indirect
90+
golang.org/x/text v0.11.0 // indirect
8291
golang.org/x/time v0.3.0 // indirect
8392
golang.org/x/tools v0.9.1 // indirect
8493
google.golang.org/appengine v1.6.7 // indirect
@@ -87,21 +96,17 @@ require (
8796
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
8897
google.golang.org/grpc v1.56.1 // indirect
8998
google.golang.org/protobuf v1.31.0 // indirect
90-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
9199
gopkg.in/fsnotify.v1 v1.4.7 // indirect
92100
gopkg.in/inf.v0 v0.9.1 // indirect
93101
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
94102
gopkg.in/yaml.v2 v2.4.0 // indirect
95103
gopkg.in/yaml.v3 v3.0.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 // indirect
104+
k8s.io/klog/v2 v2.100.1 // indirect
105+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
97106
k8s.io/test-infra v0.0.0-20200514184223-ba32c8aae783 // indirect
98-
k8s.io/utils v0.0.0-20200122174043-1e243dd1a584 // indirect
99-
sigs.k8s.io/yaml v1.2.0 // indirect
107+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
109+
sigs.k8s.io/yaml v1.3.0 // indirect
100110
)
101111

102-
replace (
103-
k8s.io/api => k8s.io/api v0.17.17
104-
k8s.io/apimachinery => k8s.io/apimachinery v0.17.17
105-
k8s.io/client-go => k8s.io/client-go v0.17.17
106-
k8s.io/component-base => k8s.io/component-base v0.17.17
107-
)
112+
replace k8s.io/client-go => k8s.io/client-go v0.28.1

0 commit comments

Comments
 (0)