From 42aba643290c19a63168513bd758822e8014a0fd Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 21 Feb 2019 18:48:28 -0500
Subject: [PATCH] Avoid using ghodss/yaml - switch to our forked repo

Change-Id: I115bc834b2b8473c3a81812a76b8433fda24a908
---
 pkg/.import-restrictions                                       | 3 ++-
 .../pkg/endpoints/handlers/fieldmanager/internal/BUILD         | 1 -
 .../handlers/fieldmanager/internal/typeconverter_test.go       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/.import-restrictions b/pkg/.import-restrictions
index 77cc61216c..3a1985a20e 100644
--- a/pkg/.import-restrictions
+++ b/pkg/.import-restrictions
@@ -6,7 +6,8 @@
 		    ""
 		],
 		"ForbiddenPrefixes": [
-			"k8s.io/kubernetes/cmd"
+			"k8s.io/kubernetes/cmd",
+			"github.com/ghodss/yaml"
 		]
 	  }
 	]
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/BUILD
index 15ec1a3f62..64d62276e9 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/BUILD
@@ -49,7 +49,6 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/github.com/ghodss/yaml:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/util/proto/testing:go_default_library",
         "//vendor/sigs.k8s.io/structured-merge-diff/fieldpath:go_default_library",
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter_test.go
index 093ce64c94..c36d686545 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter_test.go
@@ -23,7 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal"
 	"k8s.io/kube-openapi/pkg/util/proto"