Skip to content

Commit 226784a

Browse files
authored
Merge pull request kubernetes#4983 from jbartosik/address-todo
Reenable Service Account Check in VPA E2E tests
2 parents 028584a + b16ab89 commit 226784a

File tree

3,195 files changed

+611088
-29751
lines changed

Some content is hidden

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

3,195 files changed

+611088
-29751
lines changed

vertical-pod-autoscaler/e2e/go.mod

Lines changed: 109 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ go 1.17
88
require (
99
github.com/onsi/ginkgo v1.14.0
1010
github.com/onsi/gomega v1.10.1
11-
k8s.io/api v0.23.5
12-
k8s.io/apimachinery v0.23.5
11+
k8s.io/api v0.24.3
12+
k8s.io/apimachinery v0.24.3
1313
k8s.io/autoscaler/vertical-pod-autoscaler v0.0.0-20200605154545-936eea18fb1d
1414
k8s.io/client-go v11.0.0+incompatible
15-
k8s.io/component-base v0.23.5
16-
k8s.io/klog/v2 v2.30.0
17-
k8s.io/kubernetes v1.23.5
18-
k8s.io/utils v0.0.0-20211116205334-6203023598ed
15+
k8s.io/component-base v0.24.3
16+
k8s.io/klog/v2 v2.60.1
17+
k8s.io/kubernetes v1.24.3
18+
k8s.io/pod-security-admission v0.0.0
19+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
1920
)
2021

2122
require (
@@ -27,45 +28,89 @@ require (
2728
github.com/Azure/go-autorest/logger v0.2.1 // indirect
2829
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2930
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3 // indirect
31+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
32+
github.com/Microsoft/go-winio v0.4.17 // indirect
33+
github.com/Microsoft/hcsshim v0.8.22 // indirect
34+
github.com/NYTimes/gziphandler v1.1.1 // indirect
35+
github.com/PuerkitoBio/purell v1.1.1 // indirect
36+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
37+
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
3038
github.com/aws/aws-sdk-go v1.38.49 // indirect
3139
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/blang/semver v3.5.1+incompatible // indirect
33-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
34-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
40+
github.com/blang/semver/v4 v4.0.0 // indirect
41+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
42+
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
43+
github.com/cilium/ebpf v0.7.0 // indirect
44+
github.com/container-storage-interface/spec v1.5.0 // indirect
45+
github.com/containerd/cgroups v1.0.1 // indirect
46+
github.com/containerd/console v1.0.3 // indirect
47+
github.com/containerd/containerd v1.4.12 // indirect
48+
github.com/containerd/ttrpc v1.0.2 // indirect
49+
github.com/coreos/go-semver v0.3.0 // indirect
50+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
51+
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
3552
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/docker/distribution v2.7.1+incompatible // indirect
53+
github.com/docker/distribution v2.8.1+incompatible // indirect
54+
github.com/docker/go-units v0.4.0 // indirect
55+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
56+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
3757
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3858
github.com/felixge/httpsnoop v1.0.1 // indirect
3959
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
4060
github.com/fsnotify/fsnotify v1.4.9 // indirect
4161
github.com/go-logr/logr v1.2.0 // indirect
62+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
63+
github.com/go-openapi/jsonreference v0.19.5 // indirect
64+
github.com/go-openapi/swag v0.19.14 // indirect
65+
github.com/godbus/dbus/v5 v5.0.6 // indirect
4266
github.com/gogo/protobuf v1.3.2 // indirect
4367
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
68+
github.com/golang/mock v1.6.0 // indirect
4469
github.com/golang/protobuf v1.5.2 // indirect
70+
github.com/google/cadvisor v0.44.1 // indirect
71+
github.com/google/gnostic v0.5.7-v3refs // indirect
4572
github.com/google/go-cmp v0.5.5 // indirect
4673
github.com/google/gofuzz v1.1.0 // indirect
4774
github.com/google/uuid v1.1.2 // indirect
4875
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
49-
github.com/googleapis/gnostic v0.5.5 // indirect
5076
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
5177
github.com/imdario/mergo v0.3.5 // indirect
5278
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5379
github.com/jmespath/go-jmespath v0.4.0 // indirect
80+
github.com/josharian/intern v1.0.0 // indirect
5481
github.com/json-iterator/go v1.1.12 // indirect
82+
github.com/karrick/godirwalk v1.16.1 // indirect
83+
github.com/mailru/easyjson v0.7.6 // indirect
5584
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
85+
github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 // indirect
86+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
5687
github.com/moby/spdystream v0.2.0 // indirect
88+
github.com/moby/sys/mountinfo v0.6.0 // indirect
5789
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5890
github.com/modern-go/reflect2 v1.0.2 // indirect
91+
github.com/mrunalp/fileutils v0.5.0 // indirect
92+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5994
github.com/nxadm/tail v1.4.4 // indirect
6095
github.com/opencontainers/go-digest v1.0.0 // indirect
61-
github.com/opencontainers/runc v1.0.2 // indirect
96+
github.com/opencontainers/runc v1.1.1 // indirect
97+
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
98+
github.com/opencontainers/selinux v1.10.0 // indirect
6299
github.com/pkg/errors v0.9.1 // indirect
63-
github.com/prometheus/client_golang v1.11.0 // indirect
100+
github.com/prometheus/client_golang v1.12.1 // indirect
64101
github.com/prometheus/client_model v0.2.0 // indirect
65-
github.com/prometheus/common v0.28.0 // indirect
66-
github.com/prometheus/procfs v0.6.0 // indirect
67-
github.com/spf13/cobra v1.2.1 // indirect
102+
github.com/prometheus/common v0.32.1 // indirect
103+
github.com/prometheus/procfs v0.7.3 // indirect
104+
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 // indirect
105+
github.com/sirupsen/logrus v1.8.1 // indirect
106+
github.com/spf13/cobra v1.4.0 // indirect
68107
github.com/spf13/pflag v1.0.5 // indirect
108+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
109+
github.com/vishvananda/netlink v1.1.0 // indirect
110+
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
111+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
112+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
113+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
69114
go.opencensus.io v0.23.0 // indirect
70115
go.opentelemetry.io/contrib v0.20.0 // indirect
71116
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -77,17 +122,21 @@ require (
77122
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
78123
go.opentelemetry.io/otel/trace v0.20.0 // indirect
79124
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
80-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
81-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
82-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
83-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
84-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
125+
go.uber.org/atomic v1.7.0 // indirect
126+
go.uber.org/multierr v1.6.0 // indirect
127+
go.uber.org/zap v1.19.0 // indirect
128+
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
129+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
130+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
131+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
132+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
133+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
85134
golang.org/x/text v0.3.7 // indirect
86-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
135+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
87136
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
88137
google.golang.org/api v0.46.0 // indirect
89138
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
139+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
91140
google.golang.org/grpc v1.40.0 // indirect
92141
google.golang.org/protobuf v1.27.1 // indirect
93142
gopkg.in/gcfg.v1 v1.2.0 // indirect
@@ -96,51 +145,56 @@ require (
96145
gopkg.in/warnings.v0 v0.1.1 // indirect
97146
gopkg.in/yaml.v2 v2.4.0 // indirect
98147
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
99-
k8s.io/apiserver v0.23.5 // indirect
100-
k8s.io/cloud-provider v0.23.5 // indirect
101-
k8s.io/component-helpers v0.23.5 // indirect
102-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
148+
k8s.io/apiextensions-apiserver v0.0.0 // indirect
149+
k8s.io/apiserver v0.24.3 // indirect
150+
k8s.io/cloud-provider v0.24.3 // indirect
151+
k8s.io/component-helpers v0.24.3 // indirect
152+
k8s.io/cri-api v0.0.0 // indirect
153+
k8s.io/csi-translation-lib v0.24.3 // indirect
154+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
155+
k8s.io/kube-scheduler v0.0.0 // indirect
103156
k8s.io/kubectl v0.0.0 // indirect
104157
k8s.io/kubelet v0.0.0 // indirect
105158
k8s.io/legacy-cloud-providers v0.0.0 // indirect
159+
k8s.io/mount-utils v0.24.3 // indirect
106160
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
107-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
161+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
108162
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
109163
sigs.k8s.io/yaml v1.2.0 // indirect
110164
)
111165

112166
replace (
113-
k8s.io/api => k8s.io/api v0.23.5
114-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.5
115-
k8s.io/apimachinery => k8s.io/apimachinery v0.23.6-rc.0
116-
k8s.io/apiserver => k8s.io/apiserver v0.23.5
167+
k8s.io/api => k8s.io/api v0.24.3
168+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3
169+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.4-rc.0
170+
k8s.io/apiserver => k8s.io/apiserver v0.24.3
117171
k8s.io/autoscaler => ../../
118172
k8s.io/autoscaler/vertical-pod-autoscaler => ../
119-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.5
120-
k8s.io/client-go => k8s.io/client-go v0.23.5
121-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.5
122-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.5
123-
k8s.io/code-generator => k8s.io/code-generator v0.23.6-rc.0
124-
k8s.io/component-base => k8s.io/component-base v0.23.5
125-
k8s.io/cri-api => k8s.io/cri-api v0.23.6-rc.0
126-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.5
127-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.5
128-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.5
129-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.5
130-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.5
131-
k8s.io/kubectl => k8s.io/kubectl v0.23.5
132-
k8s.io/kubelet => k8s.io/kubelet v0.23.5
133-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.5
134-
k8s.io/metrics => k8s.io/metrics v0.23.5
135-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.5
136-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.5
137-
k8s.io/sample-controller => k8s.io/sample-controller v0.23.5
173+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.3
174+
k8s.io/client-go => k8s.io/client-go v0.24.3
175+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.3
176+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.3
177+
k8s.io/code-generator => k8s.io/code-generator v0.24.4-rc.0
178+
k8s.io/component-base => k8s.io/component-base v0.24.3
179+
k8s.io/cri-api => k8s.io/cri-api v0.25.0-alpha.0
180+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.3
181+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3
182+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.3
183+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.3
184+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.3
185+
k8s.io/kubectl => k8s.io/kubectl v0.24.3
186+
k8s.io/kubelet => k8s.io/kubelet v0.24.3
187+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.3
188+
k8s.io/metrics => k8s.io/metrics v0.24.3
189+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.3
190+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.3
191+
k8s.io/sample-controller => k8s.io/sample-controller v0.24.3
138192
)
139193

140-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.5
194+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.3
141195

142-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.5
196+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.3
143197

144-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.6-rc.0
198+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.4-rc.0
145199

146-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.5
200+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.3

0 commit comments

Comments
 (0)