From a46b42a92b87c04f22c77df6d57149ad34b0ee6d Mon Sep 17 00:00:00 2001
From: Natasha Sarkar <natashasarkar@google.com>
Date: Thu, 1 Jul 2021 17:10:28 -0700
Subject: [PATCH] Manually update kustomize attachment points.

---
 staging/src/k8s.io/cli-runtime/go.mod                         | 3 ++-
 staging/src/k8s.io/cli-runtime/pkg/resource/builder.go        | 2 +-
 .../src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go   | 2 +-
 .../k8s.io/cli-runtime/pkg/resource/kustomizevisitor_test.go  | 2 +-
 staging/src/k8s.io/kubectl/go.mod                             | 4 ++--
 staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go     | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod
index 4e89d1fd7e1..6f9d910f479 100644
--- a/staging/src/k8s.io/cli-runtime/go.mod
+++ b/staging/src/k8s.io/cli-runtime/go.mod
@@ -22,7 +22,8 @@ require (
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v0.0.0
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
-	sigs.k8s.io/kustomize/api v0.8.10
+	sigs.k8s.io/kustomize/api v0.8.11
+	sigs.k8s.io/kustomize/kyaml v0.11.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go b/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
index c77b79bfd88..87922680ed2 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
@@ -38,7 +38,7 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/restmapper"
-	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 var FileExtensions = []string{".json", ".yaml", ".yml"}
diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go b/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go
index 22c9a548d4b..34694794fc5 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor.go
@@ -19,7 +19,7 @@ package resource
 import (
 	"bytes"
 
-	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/kustomize/api/krusty"
 )
 
diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor_test.go b/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor_test.go
index 6bcaaf9d539..9b9ef7582c8 100644
--- a/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor_test.go
+++ b/staging/src/k8s.io/cli-runtime/pkg/resource/kustomizevisitor_test.go
@@ -18,8 +18,8 @@ package resource
 
 import (
 	"github.com/davecgh/go-spew/spew"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"testing"
 )
 
diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod
index 03aee1479bc..5e1fdc2b1a4 100644
--- a/staging/src/k8s.io/kubectl/go.mod
+++ b/staging/src/k8s.io/kubectl/go.mod
@@ -41,8 +41,8 @@ require (
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
 	k8s.io/metrics v0.0.0
 	k8s.io/utils v0.0.0-20210521133846-da695404a2bc
-	sigs.k8s.io/kustomize/api v0.8.10
-	sigs.k8s.io/kustomize/kustomize/v4 v4.1.3
+	sigs.k8s.io/kustomize/kustomize/v4 v4.2.0
+	sigs.k8s.io/kustomize/kyaml v0.11.0
 	sigs.k8s.io/yaml v1.2.0
 )
 
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go
index 7b9d85e9315..77543484c2e 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/kustomize.go
@@ -21,8 +21,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/build"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 // NewCmdKustomize returns an adapted kustomize build command.