Skip to content

Commit 60a480c

Browse files
katyannakatyanna
authored
Merge pull request #8712 from zalando-incubator/update-deps-2025-01-06
Update dependencies
2 parents c2b7ed6 + 51a16f0 commit 60a480c

File tree

6 files changed

+154
-144
lines changed

6 files changed

+154
-144
lines changed

‎test/e2e/Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# builder image
2-
FROM golang:1.22 AS builder
2+
FROM golang:1.23 AS builder
33

4-
RUN CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.15.0
4+
RUN CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.19.0
55

66
# final image
77
# TODO get rid of python dependencies
@@ -15,8 +15,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq bc curl
1515
&& pip3 install awscli --no-cache-dir -q
1616

1717
ARG KUBE_VERSION
18-
ADD https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/$TARGETARCH/kubectl /usr/bin/kubectl
19-
RUN chmod +x /usr/bin/kubectl
18+
RUN curl -L -s --fail "https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${TARGETARCH}.tar.gz" -o "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
19+
printf "1db18b863f11d507a11c394ec7705495f7baf476db31a0da8392d28d41a1ca88dc0105d3064c35178d9cc3e047354a418662c077f123ae19e6042be19c65fee9 kubernetes-client-linux-amd64.tar.gz\ne974c1db451f095ea74a459dfd03585bd6cac95d038617f7ea3384925e90a194dfaa46fe2b8ffbade32a519ad349282194fa6764bede48a7ffca38753a10b6f9 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
20+
tar xvf "kubernetes-client-linux-${TARGETARCH}.tar.gz" --strip-components 3 kubernetes/client/bin/ && \
21+
rm "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
22+
mv kubectl /usr/bin/kubectl
23+
2024

2125
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
2226

‎test/e2e/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BINARY ?= kubernetes-on-aws-e2e
44
VERSION ?= $(shell git describe --tags --always --dirty)
5-
KUBE_VERSION ?= v1.31.0
5+
KUBE_VERSION ?= v1.31.4
66
IMAGE ?= pierone.stups.zalan.do/teapot/$(BINARY)
77
SOURCES = $(shell find . -name '*.go')
88
TAG ?= $(VERSION)

‎test/e2e/go.mod

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ require (
1818
require (
1919
github.com/onsi/ginkgo/v2 v2.19.0
2020
github.com/szuecs/routegroup-client v0.21.1
21-
k8s.io/api v0.31.0
22-
k8s.io/apimachinery v0.31.0
23-
k8s.io/apiserver v0.31.0
24-
k8s.io/client-go v0.31.0
25-
k8s.io/kubernetes v1.31.0
21+
k8s.io/api v0.31.4
22+
k8s.io/apimachinery v0.31.4
23+
k8s.io/apiserver v0.31.4
24+
k8s.io/client-go v0.31.4
25+
k8s.io/kubernetes v1.31.4
2626
k8s.io/pod-security-admission v0.0.0
2727
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2828
)
@@ -151,15 +151,15 @@ require (
151151
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
152152
go.uber.org/multierr v1.11.0 // indirect
153153
go.uber.org/zap v1.26.0 // indirect
154-
golang.org/x/crypto v0.24.0 // indirect
154+
golang.org/x/crypto v0.31.0 // indirect
155155
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
156156
golang.org/x/mod v0.17.0 // indirect
157-
golang.org/x/net v0.26.0 // indirect
157+
golang.org/x/net v0.33.0 // indirect
158158
golang.org/x/oauth2 v0.21.0 // indirect
159-
golang.org/x/sync v0.7.0 // indirect
160-
golang.org/x/sys v0.21.0 // indirect
161-
golang.org/x/term v0.21.0 // indirect
162-
golang.org/x/text v0.16.0 // indirect
159+
golang.org/x/sync v0.10.0 // indirect
160+
golang.org/x/sys v0.28.0 // indirect
161+
golang.org/x/term v0.27.0 // indirect
162+
golang.org/x/text v0.21.0 // indirect
163163
golang.org/x/time v0.5.0 // indirect
164164
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
165165
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
@@ -174,24 +174,24 @@ require (
174174
gopkg.in/yaml.v2 v2.4.0 // indirect
175175
gopkg.in/yaml.v3 v3.0.1 // indirect
176176
k8s.io/apiextensions-apiserver v0.18.2 // indirect
177-
k8s.io/cli-runtime v0.31.0 // indirect
178-
k8s.io/cloud-provider v0.31.0 // indirect
177+
k8s.io/cli-runtime v0.31.4 // indirect
178+
k8s.io/cloud-provider v0.31.4 // indirect
179179
k8s.io/cluster-bootstrap v0.0.0 // indirect
180-
k8s.io/component-base v0.31.0 // indirect
181-
k8s.io/component-helpers v0.31.0 // indirect
182-
k8s.io/controller-manager v0.31.0 // indirect
183-
k8s.io/cri-api v0.31.0 // indirect
180+
k8s.io/component-base v0.31.4 // indirect
181+
k8s.io/component-helpers v0.31.4 // indirect
182+
k8s.io/controller-manager v0.31.4 // indirect
183+
k8s.io/cri-api v0.31.4 // indirect
184184
k8s.io/cri-client v0.0.0 // indirect
185-
k8s.io/csi-translation-lib v0.31.0 // indirect
185+
k8s.io/csi-translation-lib v0.31.4 // indirect
186186
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
187187
k8s.io/klog/v2 v2.130.1 // indirect
188-
k8s.io/kms v0.31.0 // indirect
188+
k8s.io/kms v0.31.4 // indirect
189189
k8s.io/kube-aggregator v0.0.0 // indirect
190190
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
191191
k8s.io/kube-scheduler v0.0.0 // indirect
192192
k8s.io/kubectl v0.0.0 // indirect
193-
k8s.io/kubelet v0.31.0 // indirect
194-
k8s.io/mount-utils v0.31.0 // indirect
193+
k8s.io/kubelet v0.31.4 // indirect
194+
k8s.io/mount-utils v0.31.4 // indirect
195195
k8s.io/sample-apiserver v0.0.0 // indirect
196196
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
197197
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -203,32 +203,32 @@ require (
203203

204204
replace (
205205
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
206-
k8s.io/api => k8s.io/api v0.31.0
207-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
208-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
209-
k8s.io/apiserver => k8s.io/apiserver v0.31.0
210-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
211-
k8s.io/client-go => k8s.io/client-go v0.31.0
212-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
213-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
214-
k8s.io/code-generator => k8s.io/code-generator v0.31.0
215-
k8s.io/component-base => k8s.io/component-base v0.31.0
216-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
217-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
218-
k8s.io/cri-api => k8s.io/cri-api v0.31.0
219-
k8s.io/cri-client => k8s.io/cri-client v0.31.0
220-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
221-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
222-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
223-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
224-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
225-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
226-
k8s.io/kubectl => k8s.io/kubectl v0.31.0
227-
k8s.io/kubelet => k8s.io/kubelet v0.31.0
228-
k8s.io/metrics => k8s.io/metrics v0.31.0
229-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0
230-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
231-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
232-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0
233-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0
206+
k8s.io/api => k8s.io/api v0.31.4
207+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.4
208+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.4
209+
k8s.io/apiserver => k8s.io/apiserver v0.31.4
210+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.4
211+
k8s.io/client-go => k8s.io/client-go v0.31.4
212+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.4
213+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.4
214+
k8s.io/code-generator => k8s.io/code-generator v0.31.4
215+
k8s.io/component-base => k8s.io/component-base v0.31.4
216+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.4
217+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.4
218+
k8s.io/cri-api => k8s.io/cri-api v0.31.4
219+
k8s.io/cri-client => k8s.io/cri-client v0.31.4
220+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.4
221+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.4
222+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.4
223+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.4
224+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.4
225+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.4
226+
k8s.io/kubectl => k8s.io/kubectl v0.31.4
227+
k8s.io/kubelet => k8s.io/kubelet v0.31.4
228+
k8s.io/metrics => k8s.io/metrics v0.31.4
229+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.4
230+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.4
231+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.4
232+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.4
233+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.4
234234
)

0 commit comments

Comments
 (0)