Merge pull request #73977 from khenidak/ipv6dualstack

ipv6 dual stack (Phase 1 - ALPHA)

Kubernetes-commit: a33840e0232aaf2b5c14c1c754d9189d7e841ec1
This commit is contained in:
Kubernetes Publisher 2019-07-02 18:07:12 -07:00
parent 9ef126ca90
commit c52ae3eb87
3 changed files with 13 additions and 8 deletions

10
Godeps/Godeps.json generated
View File

@ -130,6 +130,10 @@
"ImportPath": "github.com/prometheus/procfs",
"Rev": "1dc9a6cbc91a"
},
{
"ImportPath": "github.com/spf13/afero",
"Rev": "v1.2.2"
},
{
"ImportPath": "github.com/spf13/pflag",
"Rev": "v1.0.3"
@ -184,11 +188,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "bc5732d141a8"
"Rev": "05b5762916b3"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "327675bd8ec3"
"Rev": "e0653b7050bb"
},
{
"ImportPath": "k8s.io/klog",
@ -200,7 +204,7 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "c2654d5206da"
"Rev": "c55fbcfc754a"
},
{
"ImportPath": "sigs.k8s.io/yaml",

9
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3
k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb
)
replace (
@ -15,7 +15,6 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3
k8s.io/component-base => k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb
)

2
go.sum
View File

@ -66,6 +66,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3/go.mod h1:T1Vra67tZppnhHB3gqfn8/pmTb9EMVZXLvaevIRo6cU=
k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb/go.mod h1:lpQuE+oizrqo4Hw10LdZtrtsNR+Oq8BK9LBKFcVuoA0=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=