Use new KRMFileName function in cmd/config

e2e/e2e_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/GoogleContainerTools/kpt/e2e"
 	"github.com/GoogleContainerTools/kpt/internal/testutil"
+	"github.com/GoogleContainerTools/kpt/pkg/kptfile"
 	"github.com/GoogleContainerTools/kpt/run"
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/cmd/config/ext"
@@ -413,10 +414,10 @@ spec:
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			old := ext.GetOpenAPIFile
-			defer func() { ext.GetOpenAPIFile = old }()
-			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
-				return dir + "/Kptfile", nil
+			old := ext.KRMFileName
+			defer func() { ext.KRMFileName = old }()
+			ext.KRMFileName = func() string {
+				return kptfile.KptFileName
 			}
 
 			r, err := ioutil.TempFile(dir, "k8s-cli-*.yaml")

go.mod

@@ -25,7 +25,7 @@ require (
 	// Currently, we have to import the latest version of kubectl.
 	// Once there is a 0.18 release, we can import a semver release.
 	k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
-	sigs.k8s.io/cli-utils v0.20.1
-	sigs.k8s.io/kustomize/cmd/config v0.8.0
-	sigs.k8s.io/kustomize/kyaml v0.8.0
+	sigs.k8s.io/cli-utils v0.20.2
+	sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c
+	sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c
 )

go.sum

@@ -616,6 +616,10 @@ sigs.k8s.io/cli-utils v0.20.0 h1:45nMRNJUZF+ceQ531+ilgZOVMYzP/x3Lk4dhcivuTm4=
 sigs.k8s.io/cli-utils v0.20.0/go.mod h1:ulIQPERYwkYksNriRknJRbGECDR/ZZROpkiThlXBtB4=
 sigs.k8s.io/cli-utils v0.20.1 h1:S3IM4Rmely9oWNAeytx46PhngTwdRxsJ4ixtoGWPc3o=
 sigs.k8s.io/cli-utils v0.20.1/go.mod h1:fQkEMmLXduMNmUf1+dgQ5GRJa4OrrLMw3qzAN8YXAU8=
+sigs.k8s.io/cli-utils v0.20.2 h1:jNMu4ExtvFXlmKqZMDJqySqK55vGtVRqoLht6eIMffw=
+sigs.k8s.io/cli-utils v0.20.2/go.mod h1:uT5cVxMrOoRplL8umtrJx5R51ZWsIKD7lQfPtot80uA=
+sigs.k8s.io/cli-utils v0.20.3-0.20200922200010-e382589cbb02 h1:0qGR+FjSQ+h3atni5j2MgGpE34YjA5kfr6KUaf6BhrQ=
+sigs.k8s.io/cli-utils v0.20.3-0.20200922200010-e382589cbb02/go.mod h1:uT5cVxMrOoRplL8umtrJx5R51ZWsIKD7lQfPtot80uA=
 sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
 sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
@@ -632,6 +636,8 @@ sigs.k8s.io/kustomize/cmd/config v0.7.1-0.20200915164007-ad7fed061e2f h1:mk5lAFW
 sigs.k8s.io/kustomize/cmd/config v0.7.1-0.20200915164007-ad7fed061e2f/go.mod h1:w6fhpKsRmQlOkSS2be/3TPTDZzMsWQ5Kj9Av1lDPXFE=
 sigs.k8s.io/kustomize/cmd/config v0.8.0 h1:zrLcS03Wk8+azb3cmKuPTkIFBFg9BP0aZ1GYzEPIgFQ=
 sigs.k8s.io/kustomize/cmd/config v0.8.0/go.mod h1:3vnx3SFRfYrPJfzG8q/fHpCvjjF7ksZSt7t6nNe5qkk=
+sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c h1:TYKkSYTSPSum0iB/nGf7H9uHWn8sSkJIlRUd7ZllqXc=
+sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c/go.mod h1:UZ6TTvgftENXmRS3YWgxLkLakI9ilzTdIFyK/usXUyo=
 sigs.k8s.io/kustomize/kyaml v0.7.1/go.mod h1:ne3F9JPhW2wrVaLslxBsEe6MQJQ9YK5rUutrdhBWXwI=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200903155941-0f49fef5ed58 h1:5Yjha1M1CQfaCl4SlUC/9lPJyQfy9ljgLaY19Ja+wus=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200903155941-0f49fef5ed58/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
@@ -645,6 +651,9 @@ sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200915164007-ad7fed061e2f h1:vLk/yEunT6nB
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200915164007-ad7fed061e2f/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 sigs.k8s.io/kustomize/kyaml v0.8.0 h1:/MqPML99XAm2pbrD/eTpePh5rnU5bpnuTPqb29LpSz4=
 sigs.k8s.io/kustomize/kyaml v0.8.0/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
+sigs.k8s.io/kustomize/kyaml v0.8.1/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
+sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c h1:jvC8RRmfCZ3RzJ71tySDQJYldpPMioCyxw0IYOzd3Xg=
+sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=

run/run.go

@@ -82,8 +82,8 @@ func GetMain() *cobra.Command {
 
 	cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
 		// register function to use Kptfile for OpenAPI
-		ext.GetOpenAPIFile = func(args []string) (s string, err error) {
-			return filepath.Join(args[0], kptfile.KptFileName), nil
+		ext.KRMFileName = func() string {
+			return kptfile.KptFileName
 		}
 		err := kptopenapi.ConfigureOpenAPI(f, cmdutil.K8sSchemaSource, cmdutil.K8sSchemaPath)
 		if err != nil {