From 65a627a281ee669180e123a3a5f08829db8679fd Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 13 Nov 2020 15:15:05 -0800
Subject: [PATCH] Merge pull request #96425 from
 bobbypage/vendor-cadvisor-v0.38

Vendor cadvisor v0.38.4

Kubernetes-commit: 41533ecec8966636554faba44368a36d5d6c5347
---
 Godeps/Godeps.json | 20 ++++++++++++--------
 go.mod             |  2 --
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index a525596c4..10ca51f72 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -108,7 +108,7 @@
 		},
 		{
 			"ImportPath": "github.com/golang/groupcache",
-			"Rev": "215e87163ea7"
+			"Rev": "8c9f03a8e57e"
 		},
 		{
 			"ImportPath": "github.com/golang/mock",
@@ -116,11 +116,11 @@
 		},
 		{
 			"ImportPath": "github.com/golang/protobuf",
-			"Rev": "v1.4.2"
+			"Rev": "v1.4.3"
 		},
 		{
 			"ImportPath": "github.com/google/go-cmp",
-			"Rev": "v0.4.0"
+			"Rev": "v0.5.2"
 		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
@@ -128,7 +128,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/uuid",
-			"Rev": "v1.1.1"
+			"Rev": "v1.1.2"
 		},
 		{
 			"ImportPath": "github.com/googleapis/gnostic",
@@ -220,7 +220,7 @@
 		},
 		{
 			"ImportPath": "github.com/stretchr/testify",
-			"Rev": "v1.4.0"
+			"Rev": "v1.6.1"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto",
@@ -252,7 +252,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/text",
-			"Rev": "v0.3.3"
+			"Rev": "v0.3.4"
 		},
 		{
 			"ImportPath": "golang.org/x/tools",
@@ -260,7 +260,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/xerrors",
-			"Rev": "9bdfabe68543"
+			"Rev": "5ec99f83aff1"
 		},
 		{
 			"ImportPath": "google.golang.org/appengine",
@@ -276,7 +276,7 @@
 		},
 		{
 			"ImportPath": "google.golang.org/protobuf",
-			"Rev": "v1.24.0"
+			"Rev": "v1.25.0"
 		},
 		{
 			"ImportPath": "gopkg.in/check.v1",
@@ -298,6 +298,10 @@
 			"ImportPath": "gopkg.in/yaml.v2",
 			"Rev": "v2.2.8"
 		},
+		{
+			"ImportPath": "gopkg.in/yaml.v3",
+			"Rev": "9f266ea9e77c"
+		},
 		{
 			"ImportPath": "honnef.co/go/tools",
 			"Rev": "ea95bdfd59fc"
diff --git a/go.mod b/go.mod
index b76eb9ef2..4ad2d1e9f 100644
--- a/go.mod
+++ b/go.mod
@@ -38,5 +38,3 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.0.2
 	sigs.k8s.io/yaml v1.2.0
 )
-
-replace k8s.io/apimachinery => ../apimachinery