From 2c1d62ad0ddf627b50d417e5e504a642214e7d3c Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Tue, 2 Jul 2019 18:07:12 -0700
Subject: [PATCH] Merge pull request #73977 from khenidak/ipv6dualstack

ipv6 dual stack (Phase 1 - ALPHA)

Kubernetes-commit: a33840e0232aaf2b5c14c1c754d9189d7e841ec1
---
 Godeps/Godeps.json | 10 +++++++---
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 572d9e52..5e59ca88 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -142,6 +142,10 @@
 			"ImportPath": "github.com/remyoudompheng/bigfft",
 			"Rev": "52369c62f446"
 		},
+		{
+			"ImportPath": "github.com/spf13/afero",
+			"Rev": "v1.2.2"
+		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
 			"Rev": "v1.0.3"
@@ -232,7 +236,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "acea843d18eb"
+			"Rev": "5b0469dfd244"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
@@ -240,7 +244,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "98902b2ea1c2"
+			"Rev": "b3101450e21d"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
@@ -260,7 +264,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "c2654d5206da"
+			"Rev": "c55fbcfc754a"
 		},
 		{
 			"ImportPath": "modernc.org/cc",
diff --git a/go.mod b/go.mod
index 61143ffa..95d17666 100644
--- a/go.mod
+++ b/go.mod
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
 go 1.12
 
 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-20190703045252-5b0469dfd244
+	k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3
+	k8s.io/client-go v0.0.0-20190703045505-b3101450e21d
+	k8s.io/code-generator v0.0.0-20190627204931-86aa6a6a5cf3
 	k8s.io/klog v0.3.1
 )
 
@@ -19,9 +19,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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	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-20190703045252-5b0469dfd244
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190703045505-b3101450e21d
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190627204931-86aa6a6a5cf3
 )
diff --git a/go.sum b/go.sum
index 53d2e27c..c85c9c8e 100644
--- a/go.sum
+++ b/go.sum
@@ -104,6 +104,10 @@ 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/api v0.0.0-20190703045252-5b0469dfd244/go.mod h1:jr4AzTp4C7MlPfhI/d8bk9AkiPbNafgcLu34yBSUpK4=
+k8s.io/apimachinery v0.0.0-20190629125103-05b5762916b3/go.mod h1:T1Vra67tZppnhHB3gqfn8/pmTb9EMVZXLvaevIRo6cU=
+k8s.io/client-go v0.0.0-20190703045505-b3101450e21d/go.mod h1:xgN4VJf6FWLGcQcBOZ9HsRjjZ2mwzWwy0Xh56C20AHw=
+k8s.io/code-generator v0.0.0-20190627204931-86aa6a6a5cf3/go.mod h1:LW1Oz5h6RtOZeuEaw3xeuhQW1eYbuGPrbLNQ+hm+SDg=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=