From ad1773f8a79cc428fdf79ae219de3caf4e6916ac Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 26 Jun 2020 04:17:31 -0700
Subject: [PATCH] Merge pull request #91366 from giuseppe/cgroupfs-cgroupv2

vendor: update google/cadvisor and opencontainers/runc

Kubernetes-commit: a03db636daef0417218ef8c108c0a6530d2ef368
---
 Godeps/Godeps.json | 16 ++++++++--------
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 2871ae80..e9853a8c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,7 +372,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/sys",
-			"Rev": "915c9c3d4ccf"
+			"Rev": "ed371f2e16b4"
 		},
 		{
 			"ImportPath": "golang.org/x/text",
@@ -400,15 +400,15 @@
 		},
 		{
 			"ImportPath": "google.golang.org/genproto",
-			"Rev": "f3c370f40bfb"
+			"Rev": "cb27e3aa2013"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc",
-			"Rev": "v1.26.0"
+			"Rev": "v1.27.0"
 		},
 		{
 			"ImportPath": "google.golang.org/protobuf",
-			"Rev": "v1.23.0"
+			"Rev": "v1.24.0"
 		},
 		{
 			"ImportPath": "gopkg.in/check.v1",
@@ -440,19 +440,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "6f8e0fa87f2f"
+			"Rev": "f849118f70f6"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "eed6a5257d68"
+			"Rev": "3b98a76529ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "5fade4ec57c6"
+			"Rev": "db5293afc7bf"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "87e0dbd70a5f"
+			"Rev": "2f8561f1e9f1"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index dfe800d7..e4f58e5f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
 go 1.14
 
 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-20200626130448-f849118f70f6
+	k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
+	k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf
+	k8s.io/code-generator v0.0.0-20200626130051-2f8561f1e9f1
 	k8s.io/klog/v2 v2.1.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-20200626130448-f849118f70f6
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200626130051-2f8561f1e9f1
 )
diff --git a/go.sum b/go.sum
index 30dc5fcc..c2f99201 100644
--- a/go.sum
+++ b/go.sum
@@ -343,6 +343,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-20200626130448-f849118f70f6/go.mod h1:NKnRcQSY4TIqMb0OI3a9oDdDJflkQO6p9sY6iKIpvco=
+k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae/go.mod h1:m5QoVMHU94aieNFPfLqf7WmU8HLVLm3JasG64COkSXQ=
+k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf/go.mod h1:xWyNNU1CYxp5Qle29OSU49QrlzME3jkGOpv9FsbIFr4=
+k8s.io/code-generator v0.0.0-20200626130051-2f8561f1e9f1/go.mod h1:aD/nj2JYq+c08kIHSepJsc4OcOxWttpHwg0vxpLmR0Q=
 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=