Merge pull request #96279 from cmluciano/cml/netutilsipv4
dualstack: cleanup IsIPv4 duplicates in favor of k8s/utils functions Kubernetes-commit: 151c2799d1d76ae6a9847b89bdf912604477c2d5
This commit is contained in:
Kubernetes Publisher
commit
6cb440f495
|
|
@ -900,7 +900,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/api",
|
"ImportPath": "k8s.io/api",
|
||||||
"Rev": "01c5338f427f"
|
"Rev": "3e589e9d21e6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apimachinery",
|
"ImportPath": "k8s.io/apimachinery",
|
||||||
|
|
@ -908,23 +908,23 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/apiserver",
|
"ImportPath": "k8s.io/apiserver",
|
||||||
"Rev": "44451407e948"
|
"Rev": "333403406e47"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/client-go",
|
"ImportPath": "k8s.io/client-go",
|
||||||
"Rev": "1eb2027cd51e"
|
"Rev": "a2cda5636dc9"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/cloud-provider",
|
"ImportPath": "k8s.io/cloud-provider",
|
||||||
"Rev": "e3a9354e406b"
|
"Rev": "1e8752b7a2b6"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/component-base",
|
"ImportPath": "k8s.io/component-base",
|
||||||
"Rev": "3f97287498d9"
|
"Rev": "6bedbf41e43b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/controller-manager",
|
"ImportPath": "k8s.io/controller-manager",
|
||||||
"Rev": "0faa491fc156"
|
"Rev": "1bc7b23cb00b"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/gengo",
|
"ImportPath": "k8s.io/gengo",
|
||||||
|
|
@ -940,7 +940,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "k8s.io/utils",
|
"ImportPath": "k8s.io/utils",
|
||||||
"Rev": "d5654de09c73"
|
"Rev": "8146046b121e"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "rsc.io/binaryregexp",
|
"ImportPath": "rsc.io/binaryregexp",
|
||||||
|
|
|
||||||
16
go.mod
16
go.mod
|
|
@ -6,16 +6,16 @@ go 1.15
|
||||||
|
|
||||||
require (
|
require (
|
||||||
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
|
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
|
||||||
k8s.io/cloud-provider v0.0.0-20201105205910-e3a9354e406b
|
k8s.io/cloud-provider v0.0.0-20201107124617-1e8752b7a2b6
|
||||||
k8s.io/controller-manager v0.0.0-20201105205749-0faa491fc156
|
k8s.io/controller-manager v0.0.0-20201107124524-1bc7b23cb00b
|
||||||
)
|
)
|
||||||
|
|
||||||
replace (
|
replace (
|
||||||
k8s.io/api => k8s.io/api v0.0.0-20201104162213-01c5338f427f
|
k8s.io/api => k8s.io/api v0.0.0-20201106042650-3e589e9d21e6
|
||||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
|
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
|
||||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201105203432-44451407e948
|
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201107123045-333403406e47
|
||||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20201105042428-1eb2027cd51e
|
k8s.io/client-go => k8s.io/client-go v0.0.0-20201107122455-a2cda5636dc9
|
||||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201105205910-e3a9354e406b
|
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201107124617-1e8752b7a2b6
|
||||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20201104162905-3f97287498d9
|
k8s.io/component-base => k8s.io/component-base v0.0.0-20201107122711-6bedbf41e43b
|
||||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201105205749-0faa491fc156
|
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201107124524-1bc7b23cb00b
|
||||||
)
|
)
|
||||||
|
|
|
||||||
16
go.sum
16
go.sum
|
|
@ -574,21 +574,21 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
|
||||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||||
k8s.io/api v0.0.0-20201104162213-01c5338f427f/go.mod h1:5iJ2LFNvkNfwL+E+lMewJWlnnT3Fpj1BYHa2Qb4fjrI=
|
k8s.io/api v0.0.0-20201106042650-3e589e9d21e6/go.mod h1:zAGvr1xjhxenCwQv5PukMiA1OeGGbA56Wn+D2Fgkiqw=
|
||||||
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958/go.mod h1:WC5jfah6jg0OD6SE11oSOCQHkfkLh7pwIYbwS/dZLe4=
|
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958/go.mod h1:WC5jfah6jg0OD6SE11oSOCQHkfkLh7pwIYbwS/dZLe4=
|
||||||
k8s.io/apiserver v0.0.0-20201105203432-44451407e948/go.mod h1:vNyvxd5aa1f1IVxKOWyjMMJYcGwg+kq5Gv2BhJq8Gvc=
|
k8s.io/apiserver v0.0.0-20201107123045-333403406e47/go.mod h1:Gt6Vpka4FS30ljFbEVc0CFo2twpLDnIaqFNPOZ5hOcc=
|
||||||
k8s.io/client-go v0.0.0-20201105042428-1eb2027cd51e/go.mod h1:Uk/f7lE00tI0bzmlKkW6JIIYZkqd8dFonXGaHo46ya0=
|
k8s.io/client-go v0.0.0-20201107122455-a2cda5636dc9/go.mod h1:w+GrzKQOIjryt3wvs6qcCAk7nINEZuFnQo07+eyHsxk=
|
||||||
k8s.io/cloud-provider v0.0.0-20201105205910-e3a9354e406b/go.mod h1:mxtUVQ5oD0+Yvy5Ddh4ADrDp8EB7obkcABFiCJsPqKY=
|
k8s.io/cloud-provider v0.0.0-20201107124617-1e8752b7a2b6/go.mod h1:FGGWpojWs7wWQl+xWx3KH33xpJbklEeiHFehiPEO8Ao=
|
||||||
k8s.io/component-base v0.0.0-20201104162905-3f97287498d9/go.mod h1:e91J0JFtlK6KYq5IkdK6rjMoeeEZ68YnyCVaCUkVQuo=
|
k8s.io/component-base v0.0.0-20201107122711-6bedbf41e43b/go.mod h1:VZYfpPkDIQ4BSXMD27Sqez0l2s6bLK9uXQYhrtFdYyg=
|
||||||
k8s.io/controller-manager v0.0.0-20201105205749-0faa491fc156/go.mod h1:Jtb+pm4qHxGgLVLbt/SbMeoxkxiijk1qJrFl4Ci0Tlg=
|
k8s.io/controller-manager v0.0.0-20201107124524-1bc7b23cb00b/go.mod h1:YenbeGouaiWjcJOFQVmn7+XF2of2OXfIHBVWd62e+uk=
|
||||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||||
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
|
||||||
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
|
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
|
||||||
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
|
||||||
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=
|
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=
|
||||||
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
|
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
|
||||||
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
|
k8s.io/utils v0.0.0-20201104234853-8146046b121e h1:dUhh0zO/94tOe9DB05HFGE69ofectI1PBCmIxO612MI=
|
||||||
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
k8s.io/utils v0.0.0-20201104234853-8146046b121e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12 h1:2XkvsmLI1ZEaTcRt0rwWChxsqgXkZahuf2EV9WUFejc=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12 h1:2XkvsmLI1ZEaTcRt0rwWChxsqgXkZahuf2EV9WUFejc=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.12/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue