Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump k8s to v1.29.2 #3725

Merged
merged 1 commit into from
Feb 19, 2024
Merged

bump k8s to v1.29.2 #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ kind-install-cilium-chaining: kind-load-image kind-untaint-control-plane
$(call kind_load_image,kube-ovn,$(CILIUM_IMAGE_REPO):v$(CILIUM_VERSION),1)
kubectl apply -f yamls/cilium-chaining.yaml
helm repo add cilium https://helm.cilium.io/
helm repo update
helm install cilium cilium/cilium \
--version $(CILIUM_VERSION) \
--namespace=kube-system \
Expand Down
1 change: 1 addition & 0 deletions Makefile.e2e
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ endif

ifeq ($(E2E_CILIUM_CHAINING),true)
K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Networking.*Feature:SCTPConnectivity"
K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Services.*should serve endpoints on same port and different protocols"
endif

GINKGO_PARALLEL_OPT = -p
Expand Down
156 changes: 76 additions & 80 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/go-logr/stdr v1.2.2
github.com/google/uuid v1.6.0
github.com/greenpau/ovsdb v1.0.3
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.6.0
github.com/k8snetworkplumbingwg/sriovnet v1.2.0
github.com/kubeovn/go-iptables v0.0.0-20230322103850-8619a8ab3dca
github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230905082151-e28c4d73a589
Expand All @@ -42,17 +42,17 @@ require (
google.golang.org/grpc v1.61.1
google.golang.org/protobuf v1.32.0
gopkg.in/k8snetworkplumbingwg/multus-cni.v4 v4.0.2
k8s.io/api v0.28.7
k8s.io/apimachinery v0.28.7
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.120.1
k8s.io/kubectl v0.28.7
k8s.io/kubernetes v1.28.7
k8s.io/pod-security-admission v0.28.7
k8s.io/sample-controller v0.28.7
k8s.io/kubectl v0.29.2
k8s.io/kubernetes v1.29.2
k8s.io/pod-security-admission v0.29.2
k8s.io/sample-controller v0.29.2
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
kubevirt.io/client-go v1.0.0
sigs.k8s.io/controller-runtime v0.16.5
kubevirt.io/client-go v1.1.1
sigs.k8s.io/controller-runtime v0.17.2
)

require (
Expand Down Expand Up @@ -97,7 +97,6 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/eapache/channels v1.1.0 // indirect
Expand All @@ -115,9 +114,9 @@ require (
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
Expand All @@ -128,9 +127,9 @@ require (
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cadvisor v0.47.3 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/cadvisor v0.48.1 // indirect
github.com/google/cel-go v0.17.7 // 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
github.com/google/pprof v0.0.0-20231205033806-a5a03c77bf08 // indirect
Expand All @@ -143,7 +142,7 @@ require (
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand All @@ -159,17 +158,14 @@ require (
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
github.com/libopenstorage/openstorage v1.0.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/lithammer/dedent v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect
github.com/mdlayher/packet v1.1.2 // indirect
github.com/mdlayher/socket v0.5.0 // indirect
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/ipvs v1.1.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -195,8 +191,8 @@ require (
github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect
github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 // indirect
github.com/projectcalico/libcalico-go v0.0.0-20190305235709-3d935c3b8b86 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
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
Expand All @@ -219,16 +215,16 @@ require (
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.48.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
Expand All @@ -244,7 +240,7 @@ require (
google.golang.org/api v0.160.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
gopkg.in/gcfg.v1 v1.2.3 // indirect
Expand All @@ -254,28 +250,28 @@ 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.28.7 // indirect
k8s.io/apiserver v0.28.7 // indirect
k8s.io/cli-runtime v0.28.7 // indirect
k8s.io/cloud-provider v0.28.7 // indirect
k8s.io/cluster-bootstrap v0.28.7 // indirect
k8s.io/component-base v0.28.7 // indirect
k8s.io/component-helpers v0.28.7 // indirect
k8s.io/controller-manager v0.28.7 // indirect
k8s.io/cri-api v0.28.7 // indirect
k8s.io/csi-translation-lib v0.28.7 // indirect
k8s.io/apiextensions-apiserver v0.29.2 // indirect
k8s.io/apiserver v0.29.2 // indirect
k8s.io/cli-runtime v0.29.2 // indirect
k8s.io/cloud-provider v0.29.2 // indirect
k8s.io/cluster-bootstrap v0.29.2 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/component-helpers v0.29.2 // indirect
k8s.io/controller-manager v0.29.2 // indirect
k8s.io/cri-api v0.29.2 // indirect
k8s.io/csi-translation-lib v0.29.2 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.28.7 // indirect
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
k8s.io/kms v0.29.2 // indirect
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.28.7 // indirect
k8s.io/kubelet v0.29.2 // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
k8s.io/mount-utils v0.0.0 // indirect
kubevirt.io/api v1.0.0 // indirect
kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 // indirect
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
kubevirt.io/api v1.1.1 // indirect
kubevirt.io/containerized-data-importer-api v1.58.1 // indirect
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
moul.io/http2curl v1.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.2 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.16.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
Expand All @@ -286,36 +282,36 @@ require (
replace (
github.com/alauda/felix => github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139
github.com/greenpau/ovsdb => github.com/kubeovn/ovsdb v0.0.0-20221213053943-9372db56919f
github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20230101053045-8a0772d9c34c
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-20240218023647-f0bc3ce57fcd
github.com/vishvananda/netlink => github.com/kubeovn/netlink v0.0.0-20231209083855-5aa6b7ec69db
k8s.io/api => k8s.io/api v0.28.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.7
k8s.io/apimachinery => k8s.io/apimachinery v0.28.7
k8s.io/apiserver => k8s.io/apiserver v0.28.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.7
k8s.io/client-go => k8s.io/client-go v0.28.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.7
k8s.io/code-generator => k8s.io/code-generator v0.28.7
k8s.io/component-base => k8s.io/component-base v0.28.7
k8s.io/component-helpers => k8s.io/component-helpers v0.28.7
k8s.io/controller-manager => k8s.io/controller-manager v0.28.7
k8s.io/cri-api => k8s.io/cri-api v0.28.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.7
k8s.io/endpointslice => k8s.io/endpointslice v0.28.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.7
k8s.io/kubectl => k8s.io/kubectl v0.28.7
k8s.io/kubelet => k8s.io/kubelet v0.28.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.7
k8s.io/metrics => k8s.io/metrics v0.28.7
k8s.io/mount-utils => k8s.io/mount-utils v0.28.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.7
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20230824060608-c0b4509b6928
github.com/vishvananda/netlink => github.com/kubeovn/netlink v0.0.0-20240218024530-d3ada5dae96f
k8s.io/api => k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
k8s.io/apiserver => k8s.io/apiserver v0.29.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2
k8s.io/client-go => k8s.io/client-go v0.29.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.2
k8s.io/code-generator => k8s.io/code-generator v0.29.2
k8s.io/component-base => k8s.io/component-base v0.29.2
k8s.io/component-helpers => k8s.io/component-helpers v0.29.2
k8s.io/controller-manager => k8s.io/controller-manager v0.29.2
k8s.io/cri-api => k8s.io/cri-api v0.29.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.2
k8s.io/endpointslice => k8s.io/endpointslice v0.29.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.2
k8s.io/kubectl => k8s.io/kubectl v0.29.2
k8s.io/kubelet => k8s.io/kubelet v0.29.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.2
k8s.io/metrics => k8s.io/metrics v0.29.2
k8s.io/mount-utils => k8s.io/mount-utils v0.29.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.2
kubevirt.io/client-go => github.com/kubeovn/kubevirt-client-go v0.0.0-20240218040151-07ffb2d68c98
)
Loading
Loading