Skip to content

Bug 1964059: rebase to latest sdn-4.8-kubernetes-1.21.1 #305

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

Merged
openshift-merge-robot merged 1 commit into from
May 25, 2021
Merged

Bug 1964059: rebase to latest sdn-4.8-kubernetes-1.21.1 #305

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
70 changes: 35 additions & 35 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ require (
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink v1.1.0
k8s.io/api v1.21.0-rc.0
k8s.io/apimachinery v1.21.0-rc.0
k8s.io/apiserver v1.21.0-rc.0
k8s.io/client-go v1.21.0-rc.0
k8s.io/component-base v1.21.0-rc.0
k8s.io/cri-api v1.21.0-rc.0
k8s.io/api v1.21.1
k8s.io/apimachinery v1.21.1
k8s.io/apiserver v1.21.1
k8s.io/client-go v1.21.1
k8s.io/component-base v1.21.1
k8s.io/cri-api v1.21.1
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v1.21.0-rc.0
k8s.io/kubernetes v1.21.0-rc.0 // actually sdn-4.8-kubernetes-1.21.0-rc.0
k8s.io/kubectl v1.21.1
k8s.io/kubernetes v1.21.1 // actually sdn-4.8-kubernetes-1.21.1
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // same as sdn-4.8-kubernetes-1.21.0-rc.0
)

Expand Down Expand Up @@ -69,32 +69,32 @@ replace (
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210406190112-0dcf98c648c8
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210406190112-0dcf98c648c8
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210406190112-0dcf98c648c8
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210406190112-0dcf98c648c8
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210406190112-0dcf98c648c8
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210406190112-0dcf98c648c8
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210406190112-0dcf98c648c8
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210406190112-0dcf98c648c8
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210406190112-0dcf98c648c8
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210406190112-0dcf98c648c8
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210406190112-0dcf98c648c8
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210406190112-0dcf98c648c8
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210406190112-0dcf98c648c8
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210406190112-0dcf98c648c8
k8s.io/kubernetes => github.com/openshift/kubernetes v1.21.0-beta.1.0.20210406190112-0dcf98c648c8
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210406190112-0dcf98c648c8
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210406190112-0dcf98c648c8
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210406190112-0dcf98c648c8
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210406190112-0dcf98c648c8
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210406190112-0dcf98c648c8
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210406190112-0dcf98c648c8
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210522152935-f9da31467588
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210522152935-f9da31467588
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210522152935-f9da31467588
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210522152935-f9da31467588
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210522152935-f9da31467588
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210522152935-f9da31467588
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210522152935-f9da31467588
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210522152935-f9da31467588
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210522152935-f9da31467588
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210522152935-f9da31467588
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210522152935-f9da31467588
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210522152935-f9da31467588
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210522152935-f9da31467588
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210522152935-f9da31467588
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210522152935-f9da31467588
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210522152935-f9da31467588
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210522152935-f9da31467588
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210522152935-f9da31467588
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210522152935-f9da31467588
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210522152935-f9da31467588
k8s.io/kubernetes => github.com/openshift/kubernetes v1.21.2-0.20210522152935-f9da31467588
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210522152935-f9da31467588
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210522152935-f9da31467588
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210522152935-f9da31467588
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210522152935-f9da31467588
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210522152935-f9da31467588
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210522152935-f9da31467588
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
)
Loading