From 666bf9530f70a5d12fd0085add878622013d4837 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 28 Aug 2019 20:39:56 -0700 Subject: [PATCH] Merge pull request #79386 from khenidak/phase2-dualstack Phase 2 dualstack Kubernetes-commit: 550fb1bfc3c773febbb0811262fd7a8f7847bb20 --- Godeps/Godeps.json | 6 +++--- go.mod | 8 ++++---- go.sum | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d5ff4a2..a62f24e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -372,7 +372,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "198695d0603e" + "Rev": "40d3837b7e3d" }, { "ImportPath": "k8s.io/apimachinery", @@ -380,11 +380,11 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "b4d94f01600c" + "Rev": "8248d0a0e61a" }, { "ImportPath": "k8s.io/component-base", - "Rev": "a6cd50bc5c5b" + "Rev": "ac1d987bcbab" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 84b7414..4548e94 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.12 require ( k8s.io/apimachinery v0.0.0-20190828114620-4147c925140e - k8s.io/component-base v0.0.0-20190828115425-a6cd50bc5c5b + k8s.io/component-base v0.0.0-20190829035035-ac1d987bcbab ) replace ( @@ -17,8 +17,8 @@ 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/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20190828114745-198695d0603e + k8s.io/api => k8s.io/api v0.0.0-20190829034738-40d3837b7e3d k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190828114620-4147c925140e - k8s.io/client-go => k8s.io/client-go v0.0.0-20190828114957-b4d94f01600c - k8s.io/component-base => k8s.io/component-base v0.0.0-20190828115425-a6cd50bc5c5b + k8s.io/client-go => k8s.io/client-go v0.0.0-20190828235140-8248d0a0e61a + k8s.io/component-base => k8s.io/component-base v0.0.0-20190829035035-ac1d987bcbab ) diff --git a/go.sum b/go.sum index 893210c..e38fc65 100644 --- a/go.sum +++ b/go.sum @@ -150,10 +150,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190828114745-198695d0603e/go.mod h1:Ik8tfB+q7IZDY6j3l3XfCxTl8s2knJz66H5FNYIj4oI= +k8s.io/api v0.0.0-20190829034738-40d3837b7e3d/go.mod h1:Ik8tfB+q7IZDY6j3l3XfCxTl8s2knJz66H5FNYIj4oI= k8s.io/apimachinery v0.0.0-20190828114620-4147c925140e/go.mod h1:OOC7vMsHyCzra5xu6r1bRXkXMH76iww9BeHOAAJof4U= -k8s.io/client-go v0.0.0-20190828114957-b4d94f01600c/go.mod h1:hBtPj8YqpSm13ext0Z7Q6KIeMoHk1g15un8WUjWgj4g= -k8s.io/component-base v0.0.0-20190828115425-a6cd50bc5c5b/go.mod h1:XVxj06gJil7Lnr+Suzg3dtMQPsgE5RTrQ3pO4+3ez9E= +k8s.io/client-go v0.0.0-20190828235140-8248d0a0e61a/go.mod h1:P6tyglhf3epZgAuvfPuTrCjtREWjhdpB0DOmwEbwv/A= +k8s.io/component-base v0.0.0-20190829035035-ac1d987bcbab/go.mod h1:/+hHhZ8jfT5kDPmcYuJs9yWNDf2zLeNH6h0NPXP3y5M= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=