upstream/kubectl
1
0
Fork 0
mirror of https://github.com/kubernetes/kubectl.git synced 2026-06-04 22:32:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #96279 from cmluciano/cml/netutilsipv4

Browse source 
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
commit 7a14a4e427
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Godeps/Godeps.json generated
View file

@ -924,11 +924,11 @@
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "d004bfbce7ab"
"Rev": "d37c4734ef0c"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "9950c71bb5a3"
"Rev": "a2cda5636dc9"
},
{
"ImportPath": "k8s.io/code-generator",
@ -936,11 +936,11 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "cb2bdd362651"
"Rev": "6bedbf41e43b"
},
{
"ImportPath": "k8s.io/component-helpers",
"Rev": "2a464068d690"
"Rev": "200b091cbf2c"
},
{
"ImportPath": "k8s.io/gengo",
@ -956,11 +956,11 @@
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "295e9ef2a627"
"Rev": "0371c18f5315"
},
{
"ImportPath": "k8s.io/utils",
"Rev": "d5654de09c73"
"Rev": "8146046b121e"
},
{
"ImportPath": "rsc.io/binaryregexp",

22
go.mod
View file

@ -36,14 +36,14 @@ require (
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201106042650-3e589e9d21e6
k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
k8s.io/cli-runtime v0.0.0-20201105205002-d004bfbce7ab
k8s.io/client-go v0.0.0-20201106002952-9950c71bb5a3
k8s.io/component-base v0.0.0-20201106122545-cb2bdd362651
k8s.io/component-helpers v0.0.0-20201104163002-2a464068d690
k8s.io/cli-runtime v0.0.0-20201107124006-d37c4734ef0c
k8s.io/client-go v0.0.0-20201107122455-a2cda5636dc9
k8s.io/component-base v0.0.0-20201107122711-6bedbf41e43b
k8s.io/component-helpers v0.0.0-20201107122811-200b091cbf2c
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
k8s.io/metrics v0.0.0-20201104164049-295e9ef2a627
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
k8s.io/metrics v0.0.0-20201107123901-0371c18f5315
k8s.io/utils v0.0.0-20201104234853-8146046b121e
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
)
@ -51,10 +51,10 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20201106042650-3e589e9d21e6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201105042036-d67967d70958
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201105205002-d004bfbce7ab
k8s.io/client-go => k8s.io/client-go v0.0.0-20201106002952-9950c71bb5a3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201107124006-d37c4734ef0c
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
k8s.io/component-base => k8s.io/component-base v0.0.0-20201106122545-cb2bdd362651
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201104163002-2a464068d690
k8s.io/metrics => k8s.io/metrics v0.0.0-20201104164049-295e9ef2a627
k8s.io/component-base => k8s.io/component-base v0.0.0-20201107122711-6bedbf41e43b
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201107122811-200b091cbf2c
k8s.io/metrics => k8s.io/metrics v0.0.0-20201107123901-0371c18f5315
)

14
go.sum
View file

@ -560,11 +560,11 @@ 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=
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/cli-runtime v0.0.0-20201105205002-d004bfbce7ab/go.mod h1:WncQPvHb8X7yBCgkLPxfDx3CsUdvaCa2CToQQiuvDpU=
k8s.io/client-go v0.0.0-20201106002952-9950c71bb5a3/go.mod h1:Uk/f7lE00tI0bzmlKkW6JIIYZkqd8dFonXGaHo46ya0=
k8s.io/cli-runtime v0.0.0-20201107124006-d37c4734ef0c/go.mod h1:WSPA1WSa+2yPHHvYbUTjYZV4YDdyYAfsIhHBByo2i88=
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/component-base v0.0.0-20201106122545-cb2bdd362651/go.mod h1:UukorDQSQHga2nX5SOhmk6jenqOcWfkTz13zfV03N/s=
k8s.io/component-helpers v0.0.0-20201104163002-2a464068d690/go.mod h1:FMntmyDIm1iLTi5gEQ5hKfovf7cGLvAKBX/66698Z4Q=
k8s.io/component-base v0.0.0-20201107122711-6bedbf41e43b/go.mod h1:VZYfpPkDIQ4BSXMD27Sqez0l2s6bLK9uXQYhrtFdYyg=
k8s.io/component-helpers v0.0.0-20201107122811-200b091cbf2c/go.mod h1:7KELyJAdsXX5UgD0UVNPB0lXgSaG5n+Co1Plf1bf0Do=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -572,9 +572,9 @@ 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/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/metrics v0.0.0-20201104164049-295e9ef2a627/go.mod h1:k/IfQRDpinoxtLiq+UoXWT7vhdqOzIGjB7C0mA2R1p8=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/metrics v0.0.0-20201107123901-0371c18f5315/go.mod h1:GCaZLVcA7D/rRb7yvwC0GjaI6a28XUi22FgHMsV01d0=
k8s.io/utils v0.0.0-20201104234853-8146046b121e h1:dUhh0zO/94tOe9DB05HFGE69ofectI1PBCmIxO612MI=
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=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=