Skip to content

Commit 249b3ed

Browse files
zhangzujianzhangzujian
authored
bump k8s to v1.30.7 (#4771)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 86794c2 commit 249b3ed

File tree

6 files changed

+89
-82
lines changed

6 files changed

+89
-82
lines changed

‎.github/workflows/build-x86-image.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,16 @@ jobs:
4242
if [ ${{ github.event_name }} != 'pull_request' ]; then
4343
exit
4444
fi
45-
if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base$; then
45+
tmp_dir=`mktemp -d`
46+
cat > "$tmp_dir/on_changes.txt" <<EOF
47+
dist/images/Dockerfile.base
48+
dist/images/go-deps/download-go-deps.sh
49+
dist/images/go-deps/rebuild-go-deps.sh
50+
EOF
51+
if git diff --name-only HEAD^ HEAD | grep -Ff "$tmp_dir/on_changes.txt"; then
4652
echo build-base=1 >> "$GITHUB_OUTPUT"
4753
fi
54+
rm -frv "$tmp_dir"
4855
4956
- uses: jlumbroso/free-disk-space@v1.3.1
5057
if: steps.check.outputs.build-base == 1

‎dist/images/Dockerfile.base

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ FROM ghcr.io/aquasecurity/trivy:latest AS trivy
8585

8686
ARG ARCH
8787
ENV CNI_VERSION="v1.5.1"
88-
ENV KUBE_VERSION="v1.30.5"
88+
ENV KUBE_VERSION="v1.30.7"
8989
ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"
9090

9191
RUN apk --no-cache add curl jq

‎dist/images/go-deps/download-go-deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
ARCH=${ARCH:-amd64}
66
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.5.1}
7-
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.30.5}
7+
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.30.7}
88

99

1010
DEPS_DIR=/godeps

‎go.mod

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubeovn/kube-ovn
22

3-
go 1.22.8
3+
go 1.22.9
44

55
require (
66
github.com/Microsoft/go-winio v0.6.2
@@ -37,18 +37,18 @@ require (
3737
github.com/stretchr/testify v1.9.0
3838
github.com/vishvananda/netlink v1.2.1-beta.2.0.20240713210050-d13535d71ed3
3939
go.uber.org/mock v0.4.0
40-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
41-
golang.org/x/mod v0.21.0
42-
golang.org/x/sys v0.25.0
43-
golang.org/x/time v0.6.0
40+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
41+
golang.org/x/mod v0.22.0
42+
golang.org/x/sys v0.27.0
43+
golang.org/x/time v0.8.0
4444
google.golang.org/grpc v1.66.2
4545
google.golang.org/protobuf v1.34.2
4646
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.0
47-
k8s.io/api v0.30.5
48-
k8s.io/apimachinery v0.30.5
47+
k8s.io/api v0.30.7
48+
k8s.io/apimachinery v0.30.7
4949
k8s.io/client-go v1.5.2
5050
k8s.io/klog/v2 v2.130.1
51-
k8s.io/kubernetes v1.30.5
51+
k8s.io/kubernetes v1.30.7
5252
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3
5353
kubevirt.io/client-go v1.3.0
5454
sigs.k8s.io/controller-runtime v0.18.5
@@ -155,12 +155,12 @@ require (
155155
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
156156
go.uber.org/multierr v1.11.0 // indirect
157157
go.uber.org/zap v1.27.0 // indirect
158-
golang.org/x/net v0.29.0 // indirect
159-
golang.org/x/oauth2 v0.23.0 // indirect
160-
golang.org/x/sync v0.8.0 // indirect
161-
golang.org/x/term v0.24.0 // indirect
162-
golang.org/x/text v0.18.0 // indirect
163-
golang.org/x/tools v0.25.0 // indirect
158+
golang.org/x/net v0.31.0 // indirect
159+
golang.org/x/oauth2 v0.24.0 // indirect
160+
golang.org/x/sync v0.9.0 // indirect
161+
golang.org/x/term v0.26.0 // indirect
162+
golang.org/x/text v0.20.0 // indirect
163+
golang.org/x/tools v0.27.0 // indirect
164164
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
165165
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
166166
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
@@ -170,9 +170,9 @@ require (
170170
gopkg.in/yaml.v2 v2.4.0 // indirect
171171
gopkg.in/yaml.v3 v3.0.1 // indirect
172172
gotest.tools/v3 v3.0.2 // indirect
173-
k8s.io/apiextensions-apiserver v0.30.5 // indirect
174-
k8s.io/apiserver v0.30.5 // indirect
175-
k8s.io/component-base v0.30.5 // indirect
173+
k8s.io/apiextensions-apiserver v0.30.7 // indirect
174+
k8s.io/apiserver v0.30.7 // indirect
175+
k8s.io/component-base v0.30.7 // indirect
176176
k8s.io/kube-openapi v0.30.0 // indirect
177177
kubevirt.io/api v1.3.0 // indirect
178178
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
@@ -187,31 +187,31 @@ replace (
187187
github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68
188188
github.com/openshift/client-go => github.com/openshift/client-go v0.0.1
189189
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240814054845-978196448fb2
190-
k8s.io/api => k8s.io/api v0.30.5
191-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.5
192-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.5
193-
k8s.io/apiserver => k8s.io/apiserver v0.30.5
194-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.5
195-
k8s.io/client-go => k8s.io/client-go v0.30.5
196-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.5
197-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5
198-
k8s.io/code-generator => k8s.io/code-generator v0.30.5
199-
k8s.io/component-base => k8s.io/component-base v0.30.5
200-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.5
201-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.5
202-
k8s.io/cri-api => k8s.io/cri-api v0.30.5
203-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.5
204-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.5
205-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5
206-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5
190+
k8s.io/api => k8s.io/api v0.30.7
191+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.7
192+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.7
193+
k8s.io/apiserver => k8s.io/apiserver v0.30.7
194+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.7
195+
k8s.io/client-go => k8s.io/client-go v0.30.7
196+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.7
197+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.7
198+
k8s.io/code-generator => k8s.io/code-generator v0.30.7
199+
k8s.io/component-base => k8s.io/component-base v0.30.7
200+
k8s.io/component-helpers => k8s.io/component-helpers v0.30.7
201+
k8s.io/controller-manager => k8s.io/controller-manager v0.30.7
202+
k8s.io/cri-api => k8s.io/cri-api v0.30.7
203+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.7
204+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.7
205+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.7
206+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.7
207207
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
208-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.5
209-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5
210-
k8s.io/kubectl => k8s.io/kubectl v0.30.5
211-
k8s.io/kubelet => k8s.io/kubelet v0.30.5
212-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5
213-
k8s.io/metrics => k8s.io/metrics v0.30.5
214-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.5
215-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.5
216-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5
208+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.7
209+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.7
210+
k8s.io/kubectl => k8s.io/kubectl v0.30.7
211+
k8s.io/kubelet => k8s.io/kubelet v0.30.7
212+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.7
213+
k8s.io/metrics => k8s.io/metrics v0.30.7
214+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.7
215+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.7
216+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.7
217217
)

0 commit comments

Comments
 (0)