Skip to content

Bug 1989122: rebase to sdn-4.9-kubernetes-1.22.0-rc.0 #325

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-ci merged 2 commits into from
Aug 4, 2021
Merged

Bug 1989122: rebase to sdn-4.9-kubernetes-1.22.0-rc.0 #325

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
13c5e88
rebase to sdn-4.9-kubernetes-1.22.0-rc.0
danwinship Jul 28, 2021
8bea8b4
update for 1.22 api changes
danwinship Jul 28, 2021
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
  •  
  •  
  •  
91 changes: 46 additions & 45 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/openshift/sdn

go 1.13
go 1.16

require (
github.com/containernetworking/cni v0.8.0
github.com/containernetworking/cni v0.8.1
github.com/containernetworking/plugins v0.6.0
github.com/coreos/go-iptables v0.0.0-00010101000000-000000000000 // indirect
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a
Expand All @@ -14,20 +14,20 @@ require (
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
github.com/openshift/library-go v0.0.0-20210729061737-1f51a749a2f3
github.com/prometheus/client_golang v1.7.1
github.com/spf13/cobra v1.1.1
github.com/prometheus/client_golang v1.11.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink v1.1.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.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
k8s.io/api v1.22.0-rc.0
k8s.io/apimachinery v1.22.0-rc.0
k8s.io/apiserver v1.22.0-rc.0
k8s.io/client-go v1.22.0-rc.0
k8s.io/component-base v1.22.0-rc.0
k8s.io/cri-api v1.22.0-rc.0
k8s.io/klog/v2 v2.9.0
k8s.io/kubectl v1.22.0-rc.0
k8s.io/kubernetes v1.22.0-rc.0 // actually sdn-4.9-kubernetes-1.22.0-rc.0
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // same as sdn-4.9-kubernetes-1.22.0-rc.0
)

replace (
Expand Down Expand Up @@ -55,11 +55,11 @@ replace (
github.com/modern-go/concurrent => github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.1
github.com/munnerz/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc8.0.20190926150303-84373aaa560b
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.2-0.20190911013453-52e2591aa9f7
github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc95
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/pkg/errors => github.com/pkg/errors v0.8.0
github.com/pkg/errors => github.com/pkg/errors v0.9.1
github.com/pkg/profile => github.com/pkg/profile v1.3.0
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model => github.com/prometheus/client_model v0.2.0
Expand All @@ -69,32 +69,33 @@ 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-20210618154254-43b818f2e5a3
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210618154254-43b818f2e5a3
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210618154254-43b818f2e5a3
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210618154254-43b818f2e5a3
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210618154254-43b818f2e5a3
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210618154254-43b818f2e5a3
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210618154254-43b818f2e5a3
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210618154254-43b818f2e5a3
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210618154254-43b818f2e5a3
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210618154254-43b818f2e5a3
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210618154254-43b818f2e5a3
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210618154254-43b818f2e5a3
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210618154254-43b818f2e5a3
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210618154254-43b818f2e5a3
k8s.io/kubernetes => github.com/openshift/kubernetes v1.21.2-0.20210618154254-43b818f2e5a3
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210618154254-43b818f2e5a3
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210618154254-43b818f2e5a3
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210618154254-43b818f2e5a3
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210618154254-43b818f2e5a3
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210618154254-43b818f2e5a3
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210618154254-43b818f2e5a3
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210728142654-a85801d05770
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210728142654-a85801d05770
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210728142654-a85801d05770
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210728142654-a85801d05770
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210728142654-a85801d05770
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210728142654-a85801d05770
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210728142654-a85801d05770
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210728142654-a85801d05770
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210728142654-a85801d05770
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210728142654-a85801d05770
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210728142654-a85801d05770
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210728142654-a85801d05770
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210728142654-a85801d05770
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210728142654-a85801d05770
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210728142654-a85801d05770
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210728142654-a85801d05770
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210728142654-a85801d05770
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210728142654-a85801d05770
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210728142654-a85801d05770
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210728142654-a85801d05770
k8s.io/kubernetes => github.com/openshift/kubernetes v1.1.0-alpha.0.0.20210728142654-a85801d05770
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210728142654-a85801d05770
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210728142654-a85801d05770
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210728142654-a85801d05770
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20210728142654-a85801d05770
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210728142654-a85801d05770
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20210728142654-a85801d05770
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20210728142654-a85801d05770
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
)
Loading