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

Jump to bottom

Update all K8s dependencies to v1.25 and fix pre-run-e2e support to import images into containerd #182

Merged
merged 2 commits into from
Jan 13, 2023
Merged

Update all K8s dependencies to v1.25 and fix pre-run-e2e support to import images into containerd #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13e4782
Update all K8s dependencies to v1.25
chengxiangdong Jan 11, 2023
affdf7d
Add supported import images to containerd in pre-run-e2e.
chengxiangdong Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
96 changes: 48 additions & 48 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ require (
github.com/fsnotify/fsnotify v1.4.9
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.16
github.com/mitchellh/mapstructure v1.4.1
github.com/onsi/ginkgo/v2 v2.1.4
github.com/onsi/gomega v1.19.0
github.com/onsi/ginkgo/v2 v2.1.6
github.com/onsi/gomega v1.20.1
github.com/spf13/pflag v1.0.5
google.golang.org/grpc v1.40.0
google.golang.org/grpc v1.47.0
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.24.9
k8s.io/apimachinery v0.24.9
k8s.io/client-go v0.24.9
k8s.io/cloud-provider v0.24.9
k8s.io/component-base v0.24.9
k8s.io/api v0.25.5
k8s.io/apimachinery v0.25.5
k8s.io/client-go v0.25.5
k8s.io/cloud-provider v0.25.5
k8s.io/component-base v0.25.5
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.60.1
k8s.io/kubernetes v1.24.9
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
k8s.io/klog/v2 v2.70.1
k8s.io/kubernetes v1.25.5
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
)

require (
Expand All @@ -33,10 +33,10 @@ require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
Expand All @@ -49,7 +49,7 @@ require (
github.com/google/uuid v1.1.2 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -65,9 +65,9 @@ require (
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/cobra v1.4.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
Expand All @@ -91,48 +91,48 @@ require (
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.24.9 // indirect
k8s.io/component-helpers v0.24.9 // indirect
k8s.io/controller-manager v0.24.9 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/apiserver v0.25.5 // indirect
k8s.io/component-helpers v0.25.5 // indirect
k8s.io/controller-manager v0.25.5 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.24.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.9
k8s.io/apimachinery => k8s.io/apimachinery v0.24.9
k8s.io/apiserver => k8s.io/apiserver v0.24.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.9
k8s.io/client-go => k8s.io/client-go v0.24.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.9
k8s.io/code-generator => k8s.io/code-generator v0.24.9
k8s.io/component-base => k8s.io/component-base v0.24.9
k8s.io/component-helpers => k8s.io/component-helpers v0.24.9
k8s.io/controller-manager => k8s.io/controller-manager v0.24.9
k8s.io/cri-api => k8s.io/cri-api v0.24.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.9
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.9
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.9
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.9
k8s.io/kubectl => k8s.io/kubectl v0.24.9
k8s.io/kubelet => k8s.io/kubelet v0.24.9
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.9
k8s.io/metrics => k8s.io/metrics v0.24.9
k8s.io/mount-utils => k8s.io/mount-utils v0.24.9
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.9
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.9
k8s.io/api => k8s.io/api v0.25.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.5
k8s.io/apimachinery => k8s.io/apimachinery v0.25.5
k8s.io/apiserver => k8s.io/apiserver v0.25.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.5
k8s.io/client-go => k8s.io/client-go v0.25.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.5
k8s.io/code-generator => k8s.io/code-generator v0.25.5
k8s.io/component-base => k8s.io/component-base v0.25.5
k8s.io/component-helpers => k8s.io/component-helpers v0.25.5
k8s.io/controller-manager => k8s.io/controller-manager v0.25.5
k8s.io/cri-api => k8s.io/cri-api v0.25.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.5
k8s.io/kubectl => k8s.io/kubectl v0.25.5
k8s.io/kubelet => k8s.io/kubelet v0.25.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.5
k8s.io/metrics => k8s.io/metrics v0.25.5
k8s.io/mount-utils => k8s.io/mount-utils v0.25.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.5
)
Loading