Skip to content

Commit

Permalink
bump k8s to v1.30.0
Browse files Browse the repository at this point in the history
Signed-off-by: zhangzujian <[email protected]>
  • Loading branch information
zhangzujian committed Apr 30, 2024
1 parent dd9a25d commit 278cf0b
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 174 deletions.
2 changes: 1 addition & 1 deletion dist/images/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ARG ARCH
ENV CNI_VERSION=v1.4.1
RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan

ENV KUBE_VERSION="v1.29.4"
ENV KUBE_VERSION="v1.30.0"

RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \
&& chmod +x /usr/bin/kubectl && rm -rf ./kubernetes
Expand Down
122 changes: 53 additions & 69 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/kubeovn/kube-ovn

go 1.22

toolchain go1.22.2
go 1.22.2

require (
github.com/Microsoft/go-winio v0.6.2
Expand All @@ -26,7 +24,7 @@ require (
github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875
github.com/moby/sys/mountinfo v0.7.1
github.com/onsi/ginkgo/v2 v2.17.2
github.com/onsi/gomega v1.33.0
github.com/onsi/gomega v1.33.1
github.com/osrg/gobgp/v3 v3.25.0
github.com/ovn-org/libovsdb v0.0.0-20230711201130-6785b52d4020
github.com/parnurzeal/gorequest v0.3.0
Expand All @@ -44,34 +42,24 @@ require (
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.0.2
k8s.io/api v0.29.4
k8s.io/apimachinery v0.29.4
k8s.io/api v0.30.0
k8s.io/apimachinery v0.30.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.120.1
k8s.io/kubectl v0.29.4
k8s.io/kubernetes v1.29.4
k8s.io/pod-security-admission v0.29.4
k8s.io/sample-controller v0.29.4
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
k8s.io/kubectl v0.30.0
k8s.io/kubernetes v1.30.0
k8s.io/pod-security-admission v0.30.0
k8s.io/sample-controller v0.30.0
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22
kubevirt.io/api v1.2.0
kubevirt.io/client-go v1.2.0
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/controller-runtime v0.18.0
)

require (
cloud.google.com/go/compute v1.25.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/mocks v0.4.2 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.20.0 // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
Expand Down Expand Up @@ -124,15 +112,13 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cadvisor v0.48.1 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/cadvisor v0.49.0 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -200,7 +186,6 @@ require (
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.47.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand All @@ -216,7 +201,6 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/vmware/govmomi v0.33.1 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
Expand Down Expand Up @@ -257,21 +241,21 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.29.4 // indirect
k8s.io/apiserver v0.29.4 // indirect
k8s.io/cli-runtime v0.29.4 // indirect
k8s.io/cloud-provider v0.29.4 // indirect
k8s.io/cluster-bootstrap v0.29.4 // indirect
k8s.io/component-base v0.29.4 // indirect
k8s.io/component-helpers v0.29.4 // indirect
k8s.io/controller-manager v0.29.4 // indirect
k8s.io/cri-api v0.29.4 // indirect
k8s.io/csi-translation-lib v0.29.4 // indirect
k8s.io/apiextensions-apiserver v0.30.0 // indirect
k8s.io/apiserver v0.30.0 // indirect
k8s.io/cli-runtime v0.30.0 // indirect
k8s.io/cloud-provider v0.30.0 // indirect
k8s.io/cluster-bootstrap v0.30.0 // indirect
k8s.io/component-base v0.30.0 // indirect
k8s.io/component-helpers v0.30.0 // indirect
k8s.io/controller-manager v0.30.0 // indirect
k8s.io/cri-api v0.30.0 // indirect
k8s.io/csi-translation-lib v0.30.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.29.4 // indirect
k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 // indirect
k8s.io/kms v0.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.29.4 // indirect
k8s.io/kubelet v0.30.0 // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
k8s.io/mount-utils v0.0.0 // indirect
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
Expand All @@ -290,32 +274,32 @@ replace (
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-20240218023647-f0bc3ce57fcd
github.com/vishvananda/netlink => github.com/kubeovn/netlink v0.0.0-20240218024530-d3ada5dae96f
k8s.io/api => k8s.io/api v0.29.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
k8s.io/apiserver => k8s.io/apiserver v0.29.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
k8s.io/client-go => k8s.io/client-go v0.29.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
k8s.io/code-generator => k8s.io/code-generator v0.29.4
k8s.io/component-base => k8s.io/component-base v0.29.4
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
k8s.io/cri-api => k8s.io/cri-api v0.29.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4
k8s.io/endpointslice => k8s.io/endpointslice v0.29.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
k8s.io/kubectl => k8s.io/kubectl v0.29.4
k8s.io/kubelet => k8s.io/kubelet v0.29.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
k8s.io/metrics => k8s.io/metrics v0.29.4
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20240416080133-46355e8165e8
k8s.io/api => k8s.io/api v0.30.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
k8s.io/apiserver => k8s.io/apiserver v0.30.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
k8s.io/client-go => k8s.io/client-go v0.30.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
k8s.io/code-generator => k8s.io/code-generator v0.30.0
k8s.io/component-base => k8s.io/component-base v0.30.0
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0
k8s.io/cri-api => k8s.io/cri-api v0.30.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0
k8s.io/endpointslice => k8s.io/endpointslice v0.30.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
k8s.io/kubectl => k8s.io/kubectl v0.30.0
k8s.io/kubelet => k8s.io/kubelet v0.30.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
k8s.io/metrics => k8s.io/metrics v0.30.0
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20240430072310-d367a71d7cd7
)
Loading

0 comments on commit 278cf0b

Please sign in to comment.