Skip to content

Commit

Permalink
bump k8s to v1.30.7 (#4771)
Browse files Browse the repository at this point in the history 
Signed-off-by: zhangzujian <[email protected]>
  • Loading branch information
@zhangzujian
zhangzujian authored Nov 28, 2024
1 parent 86794c2 commit 249b3ed
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 82 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/build-x86-image.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,16 @@ jobs:
if [ ${{ github.event_name }} != 'pull_request' ]; then
exit
fi
if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base$; then
tmp_dir=`mktemp -d`
cat > "$tmp_dir/on_changes.txt" <<EOF
dist/images/Dockerfile.base
dist/images/go-deps/download-go-deps.sh
dist/images/go-deps/rebuild-go-deps.sh
EOF
if git diff --name-only HEAD^ HEAD | grep -Ff "$tmp_dir/on_changes.txt"; then
echo build-base=1 >> "$GITHUB_OUTPUT"
fi
rm -frv "$tmp_dir"
- uses: jlumbroso/[email protected]
if: steps.check.outputs.build-base == 1
Expand Down
2 changes: 1 addition & 1 deletion dist/images/Dockerfile.base
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ FROM ghcr.io/aquasecurity/trivy:latest AS trivy

ARG ARCH
ENV CNI_VERSION="v1.5.1"
ENV KUBE_VERSION="v1.30.5"
ENV KUBE_VERSION="v1.30.7"
ENV TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db:2"

RUN apk --no-cache add curl jq
Expand Down
2 changes: 1 addition & 1 deletion dist/images/go-deps/download-go-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

ARCH=${ARCH:-amd64}
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-v1.5.1}
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.30.5}
KUBECTL_VERSION=${KUBECTL_VERSION:-v1.30.7}


DEPS_DIR=/godeps
Expand Down
86 changes: 43 additions & 43 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubeovn/kube-ovn

go 1.22.8
go 1.22.9

require (
github.com/Microsoft/go-winio v0.6.2
Expand Down Expand Up @@ -37,18 +37,18 @@ require (
github.com/stretchr/testify v1.9.0
github.com/vishvananda/netlink v1.2.1-beta.2.0.20240713210050-d13535d71ed3
go.uber.org/mock v0.4.0
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/mod v0.21.0
golang.org/x/sys v0.25.0
golang.org/x/time v0.6.0
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
golang.org/x/mod v0.22.0
golang.org/x/sys v0.27.0
golang.org/x/time v0.8.0
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.2
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.1.0
k8s.io/api v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/api v0.30.7
k8s.io/apimachinery v0.30.7
k8s.io/client-go v1.5.2
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.30.5
k8s.io/kubernetes v1.30.7
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3
kubevirt.io/client-go v1.3.0
sigs.k8s.io/controller-runtime v0.18.5
Expand Down Expand Up @@ -155,12 +155,12 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/tools v0.25.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/tools v0.27.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
Expand All @@ -170,9 +170,9 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.0.2 // indirect
k8s.io/apiextensions-apiserver v0.30.5 // indirect
k8s.io/apiserver v0.30.5 // indirect
k8s.io/component-base v0.30.5 // indirect
k8s.io/apiextensions-apiserver v0.30.7 // indirect
k8s.io/apiserver v0.30.7 // indirect
k8s.io/component-base v0.30.7 // indirect
k8s.io/kube-openapi v0.30.0 // indirect
kubevirt.io/api v1.3.0 // indirect
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
Expand All @@ -187,31 +187,31 @@ replace (
github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68
github.com/openshift/client-go => github.com/openshift/client-go v0.0.1
github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240814054845-978196448fb2
k8s.io/api => k8s.io/api v0.30.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.5
k8s.io/apimachinery => k8s.io/apimachinery v0.30.5
k8s.io/apiserver => k8s.io/apiserver v0.30.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.5
k8s.io/client-go => k8s.io/client-go v0.30.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5
k8s.io/code-generator => k8s.io/code-generator v0.30.5
k8s.io/component-base => k8s.io/component-base v0.30.5
k8s.io/component-helpers => k8s.io/component-helpers v0.30.5
k8s.io/controller-manager => k8s.io/controller-manager v0.30.5
k8s.io/cri-api => k8s.io/cri-api v0.30.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5
k8s.io/api => k8s.io/api v0.30.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.7
k8s.io/apimachinery => k8s.io/apimachinery v0.30.7
k8s.io/apiserver => k8s.io/apiserver v0.30.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.7
k8s.io/client-go => k8s.io/client-go v0.30.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.7
k8s.io/code-generator => k8s.io/code-generator v0.30.7
k8s.io/component-base => k8s.io/component-base v0.30.7
k8s.io/component-helpers => k8s.io/component-helpers v0.30.7
k8s.io/controller-manager => k8s.io/controller-manager v0.30.7
k8s.io/cri-api => k8s.io/cri-api v0.30.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.7
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5
k8s.io/kubectl => k8s.io/kubectl v0.30.5
k8s.io/kubelet => k8s.io/kubelet v0.30.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5
k8s.io/metrics => k8s.io/metrics v0.30.5
k8s.io/mount-utils => k8s.io/mount-utils v0.30.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.7
k8s.io/kubectl => k8s.io/kubectl v0.30.7
k8s.io/kubelet => k8s.io/kubelet v0.30.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.7
k8s.io/metrics => k8s.io/metrics v0.30.7
k8s.io/mount-utils => k8s.io/mount-utils v0.30.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.7
)
Loading

0 comments on commit 249b3ed

Please sign in to comment.