Skip to content

Commit 7da686c

Browse files
authored
Merge pull request #489 from PiotrProkop/bump-k8s-v1.26
Bump k8s dep to v1.26
2 parents 13f34f2 + 10651ad commit 7da686c

File tree

1,631 files changed

+158220
-44138
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,631 files changed

+158220
-44138
lines changed

apis/config/scheme/scheme_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ profiles:
7777
weight: 1
7878
- name: TargetLoadPacking
7979
args:
80-
targetUtilization: 60
80+
targetUtilization: 60
8181
defaultRequests:
8282
cpu: "1000m"
8383
defaultRequestsMultiplier: "1.8"
8484
watcherAddress: http://deadbeef:2020
85-
metricProvider:
85+
metricProvider:
8686
type: Prometheus
8787
address: http://prometheus-k8s.monitoring.svc.cluster.local:9090
8888
- name: LoadVariationRiskBalancing
@@ -720,7 +720,6 @@ leaderElection:
720720
retryPeriod: 0s
721721
metricsBindAddress: ""
722722
parallelism: 0
723-
percentageOfNodesToScore: 0
724723
podInitialBackoffSeconds: 0
725724
podMaxBackoffSeconds: 0
726725
profiles:
@@ -861,7 +860,6 @@ leaderElection:
861860
resourceNamespace: ""
862861
retryPeriod: 0s
863862
parallelism: 0
864-
percentageOfNodesToScore: 0
865863
podInitialBackoffSeconds: 0
866864
podMaxBackoffSeconds: 0
867865
profiles:
@@ -1016,7 +1014,6 @@ leaderElection:
10161014
resourceNamespace: ""
10171015
retryPeriod: 0s
10181016
parallelism: 0
1019-
percentageOfNodesToScore: 0
10201017
podInitialBackoffSeconds: 0
10211018
podMaxBackoffSeconds: 0
10221019
profiles:

go.mod

Lines changed: 90 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -7,68 +7,71 @@ require (
77
github.com/diktyo-io/networktopology-api v1.0.1-alpha
88
github.com/dustin/go-humanize v1.0.0
99
github.com/go-logr/logr v1.2.3
10-
github.com/google/go-cmp v0.5.8
10+
github.com/google/go-cmp v0.5.9
1111
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.1.0
1212
github.com/k8stopologyawareschedwg/podfingerprint v0.1.2
1313
github.com/patrickmn/go-cache v2.1.0+incompatible
1414
github.com/paypal/load-watcher v0.2.2
1515
github.com/spf13/pflag v1.0.5
1616
github.com/stretchr/testify v1.8.0
1717
gonum.org/v1/gonum v0.12.0
18-
k8s.io/api v0.25.7
19-
k8s.io/apimachinery v0.25.7
20-
k8s.io/apiserver v0.25.7
21-
k8s.io/client-go v0.25.7
22-
k8s.io/code-generator v0.25.7
23-
k8s.io/component-base v0.25.7
24-
k8s.io/component-helpers v0.25.7
18+
k8s.io/api v0.26.2
19+
k8s.io/apimachinery v0.26.2
20+
k8s.io/apiserver v0.26.2
21+
k8s.io/client-go v0.26.2
22+
k8s.io/code-generator v0.26.2
23+
k8s.io/component-base v0.26.2
24+
k8s.io/component-helpers v0.26.2
2525
k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192
26-
k8s.io/klog/v2 v2.70.1
27-
k8s.io/kube-scheduler v0.25.7
28-
k8s.io/kubernetes v1.25.7
29-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
30-
sigs.k8s.io/controller-runtime v0.12.3
26+
k8s.io/klog/v2 v2.80.1
27+
k8s.io/kube-scheduler v0.26.2
28+
k8s.io/kubernetes v1.26.2
29+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
30+
sigs.k8s.io/controller-runtime v0.14.2
3131
sigs.k8s.io/yaml v1.3.0
3232
)
3333

3434
require (
3535
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3636
github.com/NYTimes/gziphandler v1.1.1 // indirect
3737
github.com/OneOfOne/xxhash v1.2.8 // indirect
38-
github.com/PuerkitoBio/purell v1.1.1 // indirect
39-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
38+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
4039
github.com/beorn7/perks v1.0.1 // indirect
4140
github.com/blang/semver/v4 v4.0.0 // indirect
41+
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
4242
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4343
github.com/coreos/go-semver v0.3.0 // indirect
4444
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
4646
github.com/docker/distribution v2.8.1+incompatible // indirect
47-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
47+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
4848
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
49-
github.com/felixge/httpsnoop v1.0.1 // indirect
49+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
50+
github.com/felixge/httpsnoop v1.0.3 // indirect
5051
github.com/francoispqt/gojay v1.2.13 // indirect
51-
github.com/fsnotify/fsnotify v1.5.1 // indirect
52+
github.com/fsnotify/fsnotify v1.6.0 // indirect
53+
github.com/go-logr/stdr v1.2.2 // indirect
5254
github.com/go-openapi/jsonpointer v0.19.5 // indirect
53-
github.com/go-openapi/jsonreference v0.19.5 // indirect
55+
github.com/go-openapi/jsonreference v0.20.0 // indirect
5456
github.com/go-openapi/swag v0.19.14 // indirect
5557
github.com/gogo/protobuf v1.3.2 // indirect
5658
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5759
github.com/golang/protobuf v1.5.2 // indirect
60+
github.com/google/cel-go v0.12.6 // indirect
5861
github.com/google/gnostic v0.5.7-v3refs // indirect
5962
github.com/google/gofuzz v1.1.0 // indirect
6063
github.com/google/uuid v1.3.0 // indirect
6164
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
62-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
65+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
6366
github.com/imdario/mergo v0.3.12 // indirect
64-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
67+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
6568
github.com/josharian/intern v1.0.0 // indirect
6669
github.com/jpillora/backoff v1.0.0 // indirect
6770
github.com/json-iterator/go v1.1.12 // indirect
6871
github.com/mailru/easyjson v0.7.6 // indirect
69-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
70-
github.com/moby/sys/mountinfo v0.6.0 // indirect
71-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
72+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
73+
github.com/moby/sys/mountinfo v0.6.2 // indirect
74+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
7275
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7376
github.com/modern-go/reflect2 v1.0.2 // indirect
7477
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -77,86 +80,89 @@ require (
7780
github.com/opencontainers/selinux v1.10.0 // indirect
7881
github.com/pkg/errors v0.9.1 // indirect
7982
github.com/pmezard/go-difflib v1.0.0 // indirect
80-
github.com/prometheus/client_golang v1.12.1 // indirect
81-
github.com/prometheus/client_model v0.2.0 // indirect
82-
github.com/prometheus/common v0.32.1 // indirect
83-
github.com/prometheus/procfs v0.7.3 // indirect
83+
github.com/prometheus/client_golang v1.14.0 // indirect
84+
github.com/prometheus/client_model v0.3.0 // indirect
85+
github.com/prometheus/common v0.37.0 // indirect
86+
github.com/prometheus/procfs v0.8.0 // indirect
8487
github.com/sirupsen/logrus v1.8.1 // indirect
85-
github.com/spf13/cobra v1.4.0 // indirect
86-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
87-
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
88-
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
89-
go.opentelemetry.io/contrib v0.20.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
92-
go.opentelemetry.io/otel v0.20.0 // indirect
93-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
94-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
95-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
96-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
97-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
98-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
99-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
88+
github.com/spf13/cobra v1.6.0 // indirect
89+
github.com/stoewer/go-strcase v1.2.0 // indirect
90+
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
91+
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
92+
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
93+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
95+
go.opentelemetry.io/otel v1.10.0 // indirect
96+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
97+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
98+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
99+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
100+
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
101+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
102+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
100103
go.uber.org/atomic v1.7.0 // indirect
101104
go.uber.org/multierr v1.6.0 // indirect
102-
go.uber.org/zap v1.19.1 // indirect
103-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
105+
go.uber.org/zap v1.24.0 // indirect
106+
golang.org/x/crypto v0.1.0 // indirect
104107
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
105-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
108+
golang.org/x/mod v0.6.0 // indirect
106109
golang.org/x/net v0.7.0 // indirect
107-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
110+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
108111
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
109112
golang.org/x/sys v0.5.0 // indirect
110113
golang.org/x/term v0.5.0 // indirect
111114
golang.org/x/text v0.7.0 // indirect
112-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
113-
golang.org/x/tools v0.1.12 // indirect
115+
golang.org/x/time v0.3.0 // indirect
116+
golang.org/x/tools v0.2.0 // indirect
114117
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
115118
google.golang.org/appengine v1.6.7 // indirect
116119
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
117-
google.golang.org/grpc v1.47.0 // indirect
118-
google.golang.org/protobuf v1.28.0 // indirect
120+
google.golang.org/grpc v1.49.0 // indirect
121+
google.golang.org/protobuf v1.28.1 // indirect
119122
gopkg.in/inf.v0 v0.9.1 // indirect
120123
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
121124
gopkg.in/yaml.v2 v2.4.0 // indirect
122125
gopkg.in/yaml.v3 v3.0.1 // indirect
123-
k8s.io/apiextensions-apiserver v0.24.2 // indirect
124-
k8s.io/cloud-provider v0.25.7 // indirect
125-
k8s.io/csi-translation-lib v0.25.7 // indirect
126-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
127-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
128-
k8s.io/metrics v0.25.7 // indirect
129-
k8s.io/mount-utils v0.25.7 // indirect
126+
k8s.io/apiextensions-apiserver v0.26.2 // indirect
127+
k8s.io/cloud-provider v0.26.2 // indirect
128+
k8s.io/csi-translation-lib v0.26.2 // indirect
129+
k8s.io/dynamic-resource-allocation v0.26.2 // indirect
130+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
131+
k8s.io/kms v0.26.2 // indirect
132+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
133+
k8s.io/metrics v0.26.2 // indirect
134+
k8s.io/mount-utils v0.26.2 // indirect
130135
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
131136
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
132137
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
133138
)
134139

135140
replace (
136-
k8s.io/api => k8s.io/api v0.25.7
137-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.7
138-
k8s.io/apimachinery => k8s.io/apimachinery v0.25.7
139-
k8s.io/apiserver => k8s.io/apiserver v0.25.7
140-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.7
141-
k8s.io/client-go => k8s.io/client-go v0.25.7
142-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.7
143-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.7
144-
k8s.io/code-generator => k8s.io/code-generator v0.25.7
145-
k8s.io/component-base => k8s.io/component-base v0.25.7
146-
k8s.io/component-helpers => k8s.io/component-helpers v0.25.7
147-
k8s.io/controller-manager => k8s.io/controller-manager v0.25.7
148-
k8s.io/cri-api => k8s.io/cri-api v0.25.7
149-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.7
150-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.7
151-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.7
152-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.7
153-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.7
154-
k8s.io/kubectl => k8s.io/kubectl v0.25.7
155-
k8s.io/kubelet => k8s.io/kubelet v0.25.7
156-
k8s.io/kubernetes => k8s.io/kubernetes v1.25.7
157-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.7
158-
k8s.io/metrics => k8s.io/metrics v0.25.7
159-
k8s.io/mount-utils => k8s.io/mount-utils v0.25.7
160-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.7
161-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.7
141+
k8s.io/api => k8s.io/api v0.26.2
142+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.2
143+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.2
144+
k8s.io/apiserver => k8s.io/apiserver v0.26.2
145+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.2
146+
k8s.io/client-go => k8s.io/client-go v0.26.2
147+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.2
148+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.2
149+
k8s.io/code-generator => k8s.io/code-generator v0.26.2
150+
k8s.io/component-base => k8s.io/component-base v0.26.2
151+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.2
152+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.2
153+
k8s.io/cri-api => k8s.io/cri-api v0.26.2
154+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.2
155+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.2
156+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.2
157+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.2
158+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.2
159+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.2
160+
k8s.io/kubectl => k8s.io/kubectl v0.26.2
161+
k8s.io/kubelet => k8s.io/kubelet v0.26.2
162+
k8s.io/kubernetes => k8s.io/kubernetes v1.26.2
163+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.2
164+
k8s.io/metrics => k8s.io/metrics v0.26.2
165+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.2
166+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.2
167+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.2
162168
)

0 commit comments

Comments
 (0)