Skip to content

Commit 5b62557

Browse files
authored
Merge pull request #1256 from mtulio/e2e-dep-bump
e2e: bump dependencies to more recent k8s lib
2 parents de9a0ab + 30ab512 commit 5b62557

File tree

5 files changed

+337
-761
lines changed

5 files changed

+337
-761
lines changed

tests/e2e/ecr_creds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = gingko.Describe("[cloud-provider-aws-e2e] ecr", func() {
3232
gingko.It("should start pod using public ecr image", func(ctx context.Context) {
3333
gingko.By("creating a pod")
3434
podclient := e2epod.NewPodClient(f)
35-
podclient.CreateSync(&v1.Pod{
35+
podclient.CreateSync(ctx, &v1.Pod{
3636
ObjectMeta: metav1.ObjectMeta{
3737
Name: "ecr-test-pod",
3838
},

tests/e2e/go.mod

Lines changed: 113 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ require (
66
github.com/aws/aws-sdk-go-v2 v1.36.3
77
github.com/aws/aws-sdk-go-v2/config v1.29.14
88
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
9-
github.com/onsi/ginkgo/v2 v2.9.4
10-
github.com/onsi/gomega v1.27.6
11-
k8s.io/api v0.26.0
12-
k8s.io/apimachinery v0.26.0
13-
k8s.io/client-go v1.5.2
14-
k8s.io/kubernetes v1.26.0
15-
k8s.io/pod-security-admission v0.26.0
9+
github.com/onsi/ginkgo/v2 v2.21.0
10+
github.com/onsi/gomega v1.35.1
11+
k8s.io/api v0.34.0
12+
k8s.io/apimachinery v0.34.0
13+
k8s.io/client-go v0.34.0
14+
k8s.io/kubernetes v1.34.0
15+
k8s.io/pod-security-admission v0.34.0
1616
)
1717

1818
require (
19+
cel.dev/expr v0.24.0 // indirect
20+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
1921
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
2022
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
2123
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
@@ -29,113 +31,122 @@ require (
2931
github.com/aws/smithy-go v1.22.2 // indirect
3032
github.com/beorn7/perks v1.0.1 // indirect
3133
github.com/blang/semver/v4 v4.0.0 // indirect
32-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
33-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3436
github.com/davecgh/go-spew v1.1.1 // indirect
35-
github.com/docker/distribution v2.8.1+incompatible // indirect
36-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/felixge/httpsnoop v1.0.3 // indirect
39-
github.com/go-logr/logr v1.2.4 // indirect
37+
github.com/distribution/reference v0.6.0 // indirect
38+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
39+
github.com/felixge/httpsnoop v1.0.4 // indirect
40+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
41+
github.com/go-logr/logr v1.4.2 // indirect
4042
github.com/go-logr/stdr v1.2.2 // indirect
41-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
42-
github.com/go-openapi/jsonreference v0.20.0 // indirect
43-
github.com/go-openapi/swag v0.19.14 // indirect
44-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
43+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
44+
github.com/go-openapi/jsonreference v0.20.2 // indirect
45+
github.com/go-openapi/swag v0.23.0 // indirect
46+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4547
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
47-
github.com/golang/protobuf v1.5.3 // indirect
48-
github.com/google/gnostic v0.5.7-v3refs // indirect
49-
github.com/google/go-cmp v0.5.9 // indirect
50-
github.com/google/gofuzz v1.1.0 // indirect
51-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
52-
github.com/google/uuid v1.1.4 // indirect
53-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
54-
github.com/imdario/mergo v0.3.11 // indirect
55-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
48+
github.com/google/cel-go v0.26.0 // indirect
49+
github.com/google/gnostic-models v0.7.0 // indirect
50+
github.com/google/go-cmp v0.7.0 // indirect
51+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
52+
github.com/google/uuid v1.6.0 // indirect
53+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
54+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
55+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5656
github.com/josharian/intern v1.0.0 // indirect
5757
github.com/json-iterator/go v1.1.12 // indirect
58-
github.com/mailru/easyjson v0.7.6 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
60-
github.com/moby/spdystream v0.2.0 // indirect
58+
github.com/mailru/easyjson v0.7.7 // indirect
59+
github.com/moby/spdystream v0.5.0 // indirect
6160
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
62-
github.com/modern-go/reflect2 v1.0.2 // indirect
61+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6362
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
63+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6464
github.com/opencontainers/go-digest v1.0.0 // indirect
6565
github.com/pkg/errors v0.9.1 // indirect
66-
github.com/prometheus/client_golang v1.14.0 // indirect
67-
github.com/prometheus/client_model v0.3.0 // indirect
68-
github.com/prometheus/common v0.37.0 // indirect
69-
github.com/prometheus/procfs v0.8.0 // indirect
70-
github.com/spf13/cobra v1.6.0 // indirect
71-
github.com/spf13/pflag v1.0.5 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
73-
go.opentelemetry.io/otel v1.10.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
77-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
78-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
79-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
80-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
81-
golang.org/x/crypto v0.1.0 // indirect
82-
golang.org/x/net v0.9.0 // indirect
83-
golang.org/x/oauth2 v0.2.0 // indirect
84-
golang.org/x/sys v0.7.0 // indirect
85-
golang.org/x/term v0.7.0 // indirect
86-
golang.org/x/text v0.9.0 // indirect
87-
golang.org/x/time v0.2.0 // indirect
88-
golang.org/x/tools v0.8.0 // indirect
89-
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
91-
google.golang.org/grpc v1.49.0 // indirect
92-
google.golang.org/protobuf v1.28.1 // indirect
93-
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
66+
github.com/pmezard/go-difflib v1.0.0 // indirect
67+
github.com/prometheus/client_golang v1.22.0 // indirect
68+
github.com/prometheus/client_model v0.6.1 // indirect
69+
github.com/prometheus/common v0.62.0 // indirect
70+
github.com/prometheus/procfs v0.15.1 // indirect
71+
github.com/spf13/cobra v1.9.1 // indirect
72+
github.com/spf13/pflag v1.0.6 // indirect
73+
github.com/stoewer/go-strcase v1.3.0 // indirect
74+
github.com/x448/float16 v0.8.4 // indirect
75+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
77+
go.opentelemetry.io/otel v1.35.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
80+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
81+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
83+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
84+
go.yaml.in/yaml/v2 v2.4.2 // indirect
85+
go.yaml.in/yaml/v3 v3.0.4 // indirect
86+
golang.org/x/crypto v0.36.0 // indirect
87+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
88+
golang.org/x/net v0.38.0 // indirect
89+
golang.org/x/oauth2 v0.27.0 // indirect
90+
golang.org/x/sync v0.12.0 // indirect
91+
golang.org/x/sys v0.31.0 // indirect
92+
golang.org/x/term v0.30.0 // indirect
93+
golang.org/x/text v0.23.0 // indirect
94+
golang.org/x/time v0.9.0 // indirect
95+
golang.org/x/tools v0.26.0 // indirect
96+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
97+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
98+
google.golang.org/grpc v1.72.1 // indirect
99+
google.golang.org/protobuf v1.36.5 // indirect
100+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
94101
gopkg.in/inf.v0 v0.9.1 // indirect
95-
gopkg.in/yaml.v2 v2.4.0 // indirect
96102
gopkg.in/yaml.v3 v3.0.1 // indirect
97-
k8s.io/apiserver v0.26.0 // indirect
98-
k8s.io/cloud-provider v0.26.0 // indirect
99-
k8s.io/component-base v0.26.0 // indirect
100-
k8s.io/component-helpers v0.26.0 // indirect
101-
k8s.io/klog/v2 v2.80.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
103-
k8s.io/kubectl v0.26.0 // indirect
104-
k8s.io/kubelet v0.26.0 // indirect
105-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
106-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
107-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
108-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
109-
sigs.k8s.io/yaml v1.3.0 // indirect
103+
k8s.io/apiextensions-apiserver v0.0.0 // indirect
104+
k8s.io/apiserver v0.34.0 // indirect
105+
k8s.io/cloud-provider v0.33.0 // indirect
106+
k8s.io/component-base v0.34.0 // indirect
107+
k8s.io/component-helpers v0.34.0 // indirect
108+
k8s.io/controller-manager v0.34.0 // indirect
109+
k8s.io/klog/v2 v2.130.1 // indirect
110+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
111+
k8s.io/kubectl v0.33.0 // indirect
112+
k8s.io/kubelet v0.34.0 // indirect
113+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
114+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
115+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
116+
sigs.k8s.io/randfill v1.0.0 // indirect
117+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
118+
sigs.k8s.io/yaml v1.6.0 // indirect
110119
)
111120

112121
replace (
113-
k8s.io/api => k8s.io/api v0.26.0
114-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
115-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.0
116-
k8s.io/apiserver => k8s.io/apiserver v0.26.0
117-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
118-
k8s.io/client-go => k8s.io/client-go v0.26.0
119-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
120-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
121-
k8s.io/code-generator => k8s.io/code-generator v0.26.0
122-
k8s.io/component-base => k8s.io/component-base v0.26.0
123-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
124-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
125-
k8s.io/cri-api => k8s.io/cri-api v0.26.0
126-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
127-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
128-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
129-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
130-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
131-
k8s.io/kubectl => k8s.io/kubectl v0.26.0
132-
k8s.io/kubelet => k8s.io/kubelet v0.26.0
133-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
134-
k8s.io/metrics => k8s.io/metrics v0.26.0
135-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.0
136-
k8s.io/node-api => k8s.io/node-api v0.26.0
137-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
138-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
139-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
140-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
122+
k8s.io/api => k8s.io/api v0.34.0
123+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
124+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
125+
k8s.io/apiserver => k8s.io/apiserver v0.34.0
126+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
127+
k8s.io/client-go => k8s.io/client-go v0.34.0
128+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0
129+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0
130+
k8s.io/code-generator => k8s.io/code-generator v0.34.0
131+
k8s.io/component-base => k8s.io/component-base v0.34.0
132+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
133+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
134+
k8s.io/cri-api => k8s.io/cri-api v0.34.0
135+
k8s.io/cri-client => k8s.io/cri-client v0.34.0
136+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
137+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
138+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0
139+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0
140+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0
141+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0
142+
k8s.io/kubectl => k8s.io/kubectl v0.34.0
143+
k8s.io/kubelet => k8s.io/kubelet v0.34.0
144+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.0
145+
k8s.io/metrics => k8s.io/metrics v0.34.0
146+
k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
147+
k8s.io/node-api => k8s.io/node-api v0.34.0
148+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
149+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
150+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
151+
k8s.io/sample-controller => k8s.io/sample-controller v0.34.0
141152
)

0 commit comments

Comments
 (0)