Merge pull request #109436 from JamesLaverack/revert-108290

Revert "Introduce APIs to support multiple ClusterCIDRs (#108290)"

Kubernetes-commit: 4cdeab4696e86c9738d99e2650d2cdfdfb0f8d32
This commit is contained in:
Kubernetes Publisher 2022-04-13 07:02:46 -07:00
parent 03614470e1
commit 18a5313a74
2 changed files with 16 additions and 16 deletions

16
go.mod
View File

@ -31,11 +31,11 @@ require (
github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220331051217-290a349b5385
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/api v0.0.0-20220413163940-7a897301bd56
k8s.io/apimachinery v0.0.0-20220406001655-080c0c77fab5
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/client-go v0.0.0-20220331051643-092a109b2b10
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a
k8s.io/client-go v0.0.0-20220413164420-28ccde769fc5
k8s.io/component-base v0.0.0-20220331212037-3b9b201c27aa
k8s.io/component-helpers v0.0.0-20220330052013-855d491da0b6
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
@ -48,12 +48,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220331051217-290a349b5385
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444
k8s.io/api => k8s.io/api v0.0.0-20220413163940-7a897301bd56
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220406001655-080c0c77fab5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8
k8s.io/client-go => k8s.io/client-go v0.0.0-20220331051643-092a109b2b10
k8s.io/client-go => k8s.io/client-go v0.0.0-20220413164420-28ccde769fc5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220330050606-8f17de063761
k8s.io/component-base => k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a
k8s.io/component-base => k8s.io/component-base v0.0.0-20220331212037-3b9b201c27aa
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220330052013-855d491da0b6
k8s.io/metrics => k8s.io/metrics v0.0.0-20220330053428-cc6cd56b3aba
)

16
go.sum
View File

@ -878,17 +878,17 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220331051217-290a349b5385 h1:f+qAtGb6ikFhuwOgV62s33+xw7QCi0hrywLfkBtCVRw=
k8s.io/api v0.0.0-20220331051217-290a349b5385/go.mod h1:69QWTzqWVlGn0rU+x3dmk3WAsUQHmeQwIBWMbK1ZEyE=
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444 h1:whQmS3GtF822OUer+LPJnMFKn6kPfuJOCM/3xUuATIY=
k8s.io/apimachinery v0.0.0-20220330050810-6550efdb7444/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/api v0.0.0-20220413163940-7a897301bd56 h1:kCg7nKtlLw11+FZqIc2ceS/j2guTgA4jW6Yuq9+TV14=
k8s.io/api v0.0.0-20220413163940-7a897301bd56/go.mod h1:jimmvAe8QfauNx6CM87E20mTsK3CPgiOzVhfaNASkJc=
k8s.io/apimachinery v0.0.0-20220406001655-080c0c77fab5 h1:nG9Zc74nUlkVHMapMJVjlH8hT3z/fBVixlVfrsQgi24=
k8s.io/apimachinery v0.0.0-20220406001655-080c0c77fab5/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8 h1:ZbBnGPg/KemzGqilVYDFeTKsFfWPiwmB+bG4JtFQi9Q=
k8s.io/cli-runtime v0.0.0-20220330053550-ef25b13feca8/go.mod h1:7rS4pOeS253kcv+ZA4KJZmQV16OU/VC+Kr0xt/TRMbc=
k8s.io/client-go v0.0.0-20220331051643-092a109b2b10 h1:+HZfIcTvYmLQzSP2aDvzBMl1e1kbtJv2j8q/CJ1hz98=
k8s.io/client-go v0.0.0-20220331051643-092a109b2b10/go.mod h1:5KZ2g659eywPk2o9iKo72HhEqqiuTWOrlVyB03peN7k=
k8s.io/client-go v0.0.0-20220413164420-28ccde769fc5 h1:rWJnUu0XjscMYcqmyM49Nsu7w1pJ7PoFbFZZAbCw1AI=
k8s.io/client-go v0.0.0-20220413164420-28ccde769fc5/go.mod h1:2AylUVFyWxiRcOPb3uDGc47Y2p3RhD+aFQBxpkNXB74=
k8s.io/code-generator v0.0.0-20220330050606-8f17de063761/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w=
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a h1:5GgsJwT9dZE4ta+/a+DDXa2FB0f7ZkmwqJbFE6CHZHo=
k8s.io/component-base v0.0.0-20220330051900-ffc9c87ab39a/go.mod h1:LJBddfwf8ppsSrBEKyFor1D79VOnf+xhBp7/sE+XB/E=
k8s.io/component-base v0.0.0-20220331212037-3b9b201c27aa h1:HXrw3PNPz5LUdx4tWHrhjcRadLTrUmerZmNc4MRYuOg=
k8s.io/component-base v0.0.0-20220331212037-3b9b201c27aa/go.mod h1:3bhERi0RMmLibjhzQTaOenaiYbqZrwtoCRd58dbFtDk=
k8s.io/component-helpers v0.0.0-20220330052013-855d491da0b6 h1:uk/kmIZFMsRpJhHc2o+5bsfgtM1jBPwIruKSzG61O98=
k8s.io/component-helpers v0.0.0-20220330052013-855d491da0b6/go.mod h1:Pn21kKbelGrlFs9SrhcV8MpJLWSlCkH/7K8qUl00wcg=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=