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 2020-11-06 18:09:50 -08:00
parent 837cce8fe3
commit 91f5438a81
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -452,15 +452,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "01c5338f427f"
"Rev": "3e589e9d21e6"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "79ef3cbd919a"
"Rev": "d67967d70958"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "68bb4a9525d8"
"Rev": "a2cda5636dc9"
},
{
"ImportPath": "k8s.io/code-generator",
@ -480,7 +480,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "d5654de09c73"
"Rev": "8146046b121e"
},
{
"ImportPath": "rsc.io/binaryregexp",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20201106042650-3e589e9d21e6
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
k8s.io/client-go v0.0.0-20201107122455-a2cda5636dc9
k8s.io/code-generator v0.0.0-20201104161901-3609764c976f
k8s.io/klog/v2 v2.4.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20201106042650-3e589e9d21e6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
k8s.io/client-go => k8s.io/client-go v0.0.0-20201107122455-a2cda5636dc9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201104161901-3609764c976f
)

4
go.sum
View File

@ -352,6 +352,10 @@ 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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
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/client-go v0.0.0-20201107122455-a2cda5636dc9/go.mod h1:w+GrzKQOIjryt3wvs6qcCAk7nINEZuFnQo07+eyHsxk=
k8s.io/code-generator v0.0.0-20201104161901-3609764c976f/go.mod h1:XBVD9f8PJVt5zdhi95/mi/yGQEn1GSqbrfD17zGD/l4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=