Skip to content

Commit 8bb5819

Browse files
authored
Merge pull request #1260 from mythi/PR-2022-085
upgrade to k8s 1.26.0-rc.1 and controller-runtime@master
2 parents 09b264c + 34d930a commit 8bb5819

File tree

16 files changed

+274
-239
lines changed

16 files changed

+274
-239
lines changed

go.mod

+73-69
Original file line numberDiff line numberDiff line change
@@ -9,124 +9,128 @@ require (
99
github.com/google/go-cmp v0.5.9
1010
github.com/google/gousb v1.1.2
1111
github.com/klauspost/cpuid/v2 v2.2.1
12-
github.com/onsi/ginkgo/v2 v2.4.0
13-
github.com/onsi/gomega v1.24.0
12+
github.com/onsi/ginkgo/v2 v2.5.1
13+
github.com/onsi/gomega v1.24.1
1414
github.com/pkg/errors v0.9.1
1515
golang.org/x/sys v0.3.0
1616
golang.org/x/text v0.5.0
1717
google.golang.org/grpc v1.51.0
18-
k8s.io/api v0.25.3
19-
k8s.io/apimachinery v0.25.3
18+
k8s.io/api v0.26.0-rc.1
19+
k8s.io/apimachinery v0.26.0-rc.1
2020
k8s.io/client-go v1.5.2
21-
k8s.io/component-base v0.25.3
22-
k8s.io/klog/v2 v2.70.1
23-
k8s.io/kubelet v1.25.3
24-
k8s.io/kubernetes v1.25.3
21+
k8s.io/component-base v0.26.0-rc.1
22+
k8s.io/klog/v2 v2.80.1
23+
k8s.io/kubelet v1.26.0-rc.1
24+
k8s.io/kubernetes v1.26.0-rc.1
2525
k8s.io/pod-security-admission v0.0.0
26-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
27-
sigs.k8s.io/controller-runtime v0.13.1
26+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
27+
sigs.k8s.io/controller-runtime v0.13.1-0.20221201045826-d9912251cd81
2828
sigs.k8s.io/yaml v1.3.0
2929
)
3030

3131
require (
3232
github.com/Microsoft/go-winio v0.4.17 // indirect
33-
github.com/PuerkitoBio/purell v1.1.1 // indirect
34-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3533
github.com/beorn7/perks v1.0.1 // indirect
3634
github.com/blang/semver/v4 v4.0.0 // indirect
35+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
3736
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3837
github.com/davecgh/go-spew v1.1.1 // indirect
3938
github.com/docker/distribution v2.8.1+incompatible // indirect
40-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
4140
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4241
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
43-
github.com/felixge/httpsnoop v1.0.1 // indirect
42+
github.com/felixge/httpsnoop v1.0.3 // indirect
43+
github.com/go-logr/stdr v1.2.2 // indirect
4444
github.com/go-openapi/jsonpointer v0.19.5 // indirect
45-
github.com/go-openapi/jsonreference v0.19.5 // indirect
45+
github.com/go-openapi/jsonreference v0.20.0 // indirect
4646
github.com/go-openapi/swag v0.19.14 // indirect
4747
github.com/gogo/protobuf v1.3.2 // indirect
4848
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4949
github.com/golang/protobuf v1.5.2 // indirect
5050
github.com/google/gnostic v0.5.7-v3refs // indirect
5151
github.com/google/gofuzz v1.2.0 // indirect
5252
github.com/google/uuid v1.3.0 // indirect
53-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
53+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
5454
github.com/imdario/mergo v0.3.12 // indirect
55-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
55+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5656
github.com/josharian/intern v1.0.0 // indirect
5757
github.com/json-iterator/go v1.1.12 // indirect
5858
github.com/mailru/easyjson v0.7.6 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
59+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
6060
github.com/moby/spdystream v0.2.0 // indirect
6161
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6262
github.com/modern-go/reflect2 v1.0.2 // indirect
6363
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6464
github.com/opencontainers/go-digest v1.0.0 // indirect
65-
github.com/prometheus/client_golang v1.12.2 // indirect
66-
github.com/prometheus/client_model v0.2.0 // indirect
67-
github.com/prometheus/common v0.32.1 // indirect
68-
github.com/prometheus/procfs v0.7.3 // indirect
69-
github.com/spf13/cobra v1.4.0 // indirect
65+
github.com/prometheus/client_golang v1.14.0 // indirect
66+
github.com/prometheus/client_model v0.3.0 // indirect
67+
github.com/prometheus/common v0.37.0 // indirect
68+
github.com/prometheus/procfs v0.8.0 // indirect
69+
github.com/spf13/cobra v1.6.0 // indirect
7070
github.com/spf13/pflag v1.0.5 // indirect
71-
go.opentelemetry.io/contrib v0.20.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
73-
go.opentelemetry.io/otel v0.20.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
75-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
76-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
77-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
78-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
79-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
80-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
81-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
82-
golang.org/x/net v0.1.0 // indirect
83-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
84-
golang.org/x/term v0.1.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
72+
go.opentelemetry.io/otel v1.10.0 // indirect
73+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
76+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
77+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
78+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
79+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
80+
golang.org/x/crypto v0.1.0 // indirect
81+
golang.org/x/net v0.2.0 // indirect
82+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
83+
golang.org/x/term v0.2.0 // indirect
8584
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
8685
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
8786
google.golang.org/appengine v1.6.7 // indirect
8887
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
89-
google.golang.org/protobuf v1.28.0 // indirect
88+
google.golang.org/protobuf v1.28.1 // indirect
9089
gopkg.in/inf.v0 v0.9.1 // indirect
9190
gopkg.in/yaml.v2 v2.4.0 // indirect
9291
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
94-
k8s.io/apiserver v0.25.3 // indirect
95-
k8s.io/component-helpers v0.25.3 // indirect
96-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
92+
k8s.io/apiextensions-apiserver v0.26.0-alpha.3 // indirect
93+
k8s.io/apiserver v0.26.0-rc.1 // indirect
94+
k8s.io/component-helpers v0.26.0-rc.1 // indirect
95+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
9796
k8s.io/kubectl v0.0.0 // indirect
9897
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
9998
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
10099
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
101100
)
102101

103102
replace (
104-
k8s.io/api => k8s.io/api v0.25.3
105-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
106-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.4-rc.0
107-
k8s.io/apiserver => k8s.io/apiserver v0.25.3
108-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
109-
k8s.io/client-go => k8s.io/client-go v0.25.3
110-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3
111-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3
112-
k8s.io/code-generator => k8s.io/code-generator v0.25.4-rc.0
113-
k8s.io/component-base => k8s.io/component-base v0.25.3
114-
k8s.io/component-helpers => k8s.io/component-helpers v0.25.3
115-
k8s.io/controller-manager => k8s.io/controller-manager v0.25.3
116-
k8s.io/cri-api => k8s.io/cri-api v0.25.4-rc.0
117-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3
118-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3
119-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3
120-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3
121-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3
122-
k8s.io/kubectl => k8s.io/kubectl v0.25.3
123-
k8s.io/kubelet => k8s.io/kubelet v0.25.3
124-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3
125-
k8s.io/metrics => k8s.io/metrics v0.25.3
126-
k8s.io/mount-utils => k8s.io/mount-utils v0.25.4-rc.0
127-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3
128-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3
129-
k8s.io/sample-controller => k8s.io/sample-controller v0.25.3
103+
k8s.io/api => k8s.io/api v0.26.0-rc.1
104+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0-rc.1
105+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0-rc.1
106+
k8s.io/apiserver => k8s.io/apiserver v0.26.0-rc.1
107+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0-rc.1
108+
k8s.io/client-go => k8s.io/client-go v0.26.0-rc.1
109+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0-rc.1
110+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0-rc.1
111+
k8s.io/code-generator => k8s.io/code-generator v0.26.0-rc.1
112+
k8s.io/component-base => k8s.io/component-base v0.26.0-rc.1
113+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0-rc.1
114+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0-rc.1
115+
k8s.io/cri-api => k8s.io/cri-api v0.26.0-rc.1
116+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0-rc.1
117+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0-rc.1
118+
k8s.io/kms => k8s.io/kms v0.26.0-rc.1
119+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0-rc.1
120+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0-rc.1
121+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0-rc.1
122+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0-rc.1
123+
k8s.io/kubectl => k8s.io/kubectl v0.26.0-rc.1
124+
k8s.io/kubelet => k8s.io/kubelet v0.26.0-rc.1
125+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0-rc.1
126+
k8s.io/metrics => k8s.io/metrics v0.26.0-rc.1
127+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0-rc.1
128+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0-rc.1
129+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0-rc.1
130+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0-rc.1
131+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.0-rc.1
130132
)
131133

132-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3
134+
replace github.com/onsi/gomega v1.24.1 => github.com/onsi/gomega v1.24.0
135+
136+
replace github.com/onsi/ginkgo/v2 v2.5.1 => github.com/onsi/ginkgo/v2 v2.4.0

0 commit comments

Comments
 (0)