Use latest kyaml and cmd/config

kptdev · Aug 20, 2020 · d44d4fd · d44d4fd
1 parent 9faf614
commit d44d4fd
Show file tree

Hide file tree

Showing 11 changed files with 179 additions and 58 deletions.
diff --git a/go.mod b/go.mod
@@ -24,6 +24,6 @@ require (
 	// 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.18.1
-	sigs.k8s.io/kustomize/cmd/config v0.6.0
-	sigs.k8s.io/kustomize/kyaml v0.6.0
+	sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200819192723-596c39b7bcb7
+	sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200819192723-596c39b7bcb7
 )
diff --git a/go.sum b/go.sum
@@ -651,6 +651,8 @@ sigs.k8s.io/cli-utils v0.18.0 h1:PPFUhhwKsdMiYYm1DY9lZursNWSAEj8FYgMCZKVvOkQ=
 sigs.k8s.io/cli-utils v0.18.0/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
 sigs.k8s.io/cli-utils v0.18.1 h1:K4usJmMlI98mL+z+TdAnKfzng64/m8bRXZKPwy3ZCWw=
 sigs.k8s.io/cli-utils v0.18.1/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
+sigs.k8s.io/cli-utils v0.18.2-0.20200819040110-516c2d7596e9 h1:L+lyMbHUr1ibVQh3sl7PqRTzatQfz6chiRjxSFr5x2c=
+sigs.k8s.io/cli-utils v0.18.2-0.20200819040110-516c2d7596e9/go.mod h1:B7KdqkSkHNIUn3cFbaR4aKUZMKtr+Benboi1w/HW/Fg=
 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=
@@ -659,12 +661,16 @@ sigs.k8s.io/kustomize/cmd/config v0.5.0 h1:GcQc8tMyUQ+vDl7fYr5ZZzkjwNoHvqI+eKIpg
 sigs.k8s.io/kustomize/cmd/config v0.5.0/go.mod h1:8NsFm1pvHFdB3Mo5nzoU3puzGPbS/+7LvzYwLnPEnag=
 sigs.k8s.io/kustomize/cmd/config v0.6.0 h1:03tjs3SjvsumZjabctLicNUQwYlAeUqmRk1H4JBK+wI=
 sigs.k8s.io/kustomize/cmd/config v0.6.0/go.mod h1:azYDRZ/lprMhKqF4DbquWS0cfBFaInLM3LN+zuAXRDI=
+sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200819192723-596c39b7bcb7 h1:l9JWlX+QSIWu2jV3fcbPkcuVR5N5WOcoCSSvQobxhhk=
+sigs.k8s.io/kustomize/cmd/config v0.6.1-0.20200819192723-596c39b7bcb7/go.mod h1:y2+Op5gW7quHA6s6y32YX6J6WLB/H/cFIak1p7peQLA=
 sigs.k8s.io/kustomize/kyaml v0.4.0 h1:jMQrJOJmiUz5Y018ki0mXWpEreEXjvad1NRfXTdi9vU=
 sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw=
 sigs.k8s.io/kustomize/kyaml v0.5.0 h1:xufpSxgpugQxtd0aN1ZsWnr3Kj0fpAi7GN4dnEs4oPg=
 sigs.k8s.io/kustomize/kyaml v0.5.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 sigs.k8s.io/kustomize/kyaml v0.6.0 h1:Z/9TxsiG21sbcd6JD4IeM6BVZ2+04001KKzbxCf+qeY=
 sigs.k8s.io/kustomize/kyaml v0.6.0/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
+sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200819192723-596c39b7bcb7 h1:iQG6l9KYbKkOscdCtKoqPeMNKPdAuQmYz75h8H32V3k=
+sigs.k8s.io/kustomize/kyaml v0.6.1-0.20200819192723-596c39b7bcb7/go.mod h1:bEzbO5pN9OvlEeCLvFHo8Pu7SA26Herc2m60UeWZBdI=
 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=

diff --git a/internal/cmdget/cmdget_test.go b/internal/cmdget/cmdget_test.go
@@ -46,9 +46,15 @@ func TestCmd_execute(t *testing.T) {
 	assert.NoError(t, err)
 	g.AssertKptfile(t, dest, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",

diff --git a/internal/cmdinit/cmdinit.go b/internal/cmdinit/cmdinit.go
@@ -91,7 +91,13 @@ func (r *Runner) runE(c *cobra.Command, args []string) error {
 	if _, err = os.Stat(filepath.Join(args[0], "Kptfile")); os.IsNotExist(err) {
 		fmt.Fprintf(c.OutOrStdout(), "writing %s\n", filepath.Join(args[0], "Kptfile"))
 		k := kptfile.KptFile{
-			ResourceMeta: yaml.ResourceMeta{ObjectMeta: yaml.ObjectMeta{Name: r.Name}},
+			ResourceMeta: yaml.ResourceMeta{
+				ObjectMeta: yaml.ObjectMeta{
+					NameMeta: yaml.NameMeta{
+						Name: r.Name,
+					},
+				},
+			},
 			PackageMeta: kptfile.PackageMeta{
 				ShortDescription: r.Description,
 				URL:              r.URL,

diff --git a/internal/cmdupdate/cmdupdate_test.go b/internal/cmdupdate/cmdupdate_test.go
@@ -81,9 +81,15 @@ func TestCmd_execute(t *testing.T) {
 	}
 	if !g.AssertKptfile(t, dest, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",

diff --git a/internal/kptfile/pkgfile.go b/internal/kptfile/pkgfile.go
@@ -24,8 +24,10 @@ const KptFileName = "Kptfile"
 
 // TypeMeta is the TypeMeta for KptFile instances.
 var TypeMeta = yaml.ResourceMeta{
-	Kind:       KptFileName,
-	APIVersion: "kpt.dev/v1alpha1",
+	TypeMeta: yaml.TypeMeta{
+		APIVersion: "kpt.dev/v1alpha1",
+		Kind:       KptFileName,
+	},
 }
 
 // KptFile contains information about a package managed with kpt

diff --git a/internal/kptfile/pkgfile_test.go b/internal/kptfile/pkgfile_test.go
@@ -51,9 +51,15 @@ upstream:
 	assert.NoError(t, err)
 	assert.Equal(t, KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: "cockroachdb"},
-			APIVersion: TypeMeta.APIVersion,
-			Kind:       TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: "cockroachdb",
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: TypeMeta.APIVersion,
+				Kind:       TypeMeta.Kind},
+		},
 		Upstream: Upstream{
 			Type: "git",
 			Git: Git{

diff --git a/internal/util/get/get.go b/internal/util/get/get.go
@@ -253,9 +253,15 @@ func (c *Command) upsertKptfile(spec *git.RepoSpec) error {
 		// no KptFile present, create a default
 		kpgfile = kptfile.KptFile{
 			ResourceMeta: yaml.ResourceMeta{
-				APIVersion: kptfile.TypeMeta.APIVersion,
-				Kind:       kptfile.TypeMeta.Kind,
-				ObjectMeta: yaml.ObjectMeta{Name: c.Name},
+				TypeMeta: yaml.TypeMeta{
+					APIVersion: kptfile.TypeMeta.APIVersion,
+					Kind:       kptfile.TypeMeta.Kind,
+				},
+				ObjectMeta: yaml.ObjectMeta{
+					NameMeta: yaml.NameMeta{
+						Name: c.Name,
+					},
+				},
 			},
 		}
 	}

diff --git a/internal/util/get/get_test.go b/internal/util/get/get_test.go
@@ -63,9 +63,15 @@ func TestCommand_Run(t *testing.T) {
 	assert.NoError(t, err)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -103,9 +109,15 @@ func TestCommand_Run_subdir(t *testing.T) {
 	assert.NoError(t, err)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: subdir},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: subdir,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -138,9 +150,15 @@ func TestCommand_Run_destination(t *testing.T) {
 	assert.NoError(t, err)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: dest},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: dest,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -179,9 +197,15 @@ func TestCommand_Run_subdirAndDestination(t *testing.T) {
 	assert.NoError(t, err)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: dest},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: dest,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -233,9 +257,15 @@ func TestCommand_Run_branch(t *testing.T) {
 	// verify the KptFile contains the expected values
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -292,9 +322,15 @@ func TestCommand_Run_tag(t *testing.T) {
 	// verify the KptFile contains the expected values
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -333,9 +369,15 @@ func TestCommand_Run_clean(t *testing.T) {
 
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -368,9 +410,15 @@ func TestCommand_Run_clean(t *testing.T) {
 	g.AssertEqual(t, filepath.Join(g.DatasetDirectory, testutil.Dataset2), r)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -409,9 +457,15 @@ func TestCommand_Run_failClean(t *testing.T) {
 	g.AssertEqual(t, filepath.Join(g.DatasetDirectory, testutil.Dataset1), r)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -444,9 +498,15 @@ func TestCommand_Run_failClean(t *testing.T) {
 	g.AssertEqual(t, filepath.Join(g.DatasetDirectory, testutil.Dataset1), r)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -480,9 +540,15 @@ func TestCommand_Run_failExistingDir(t *testing.T) {
 	g.AssertEqual(t, filepath.Join(g.DatasetDirectory, testutil.Dataset1), r)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",
@@ -511,9 +577,15 @@ func TestCommand_Run_failExistingDir(t *testing.T) {
 	g.AssertEqual(t, filepath.Join(g.DatasetDirectory, testutil.Dataset1), r)
 	g.AssertKptfile(t, r, kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			ObjectMeta: yaml.ObjectMeta{Name: g.RepoName},
-			APIVersion: kptfile.TypeMeta.APIVersion,
-			Kind:       kptfile.TypeMeta.Kind},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: g.RepoName,
+				},
+			},
+			TypeMeta: yaml.TypeMeta{
+				APIVersion: kptfile.TypeMeta.APIVersion,
+				Kind:       kptfile.TypeMeta.Kind},
+		},
 		PackageMeta: kptfile.PackageMeta{},
 		Upstream: kptfile.Upstream{
 			Type: "git",

diff --git a/internal/util/get/getioreader/getioreader.go b/internal/util/get/getioreader/getioreader.go
@@ -49,8 +49,13 @@ func Get(path, pattern string, input io.Reader) error {
 
 	k := kptfile.KptFile{
 		ResourceMeta: yaml.ResourceMeta{
-			Kind:       "Kptfile",
-			ObjectMeta: yaml.ObjectMeta{Name: filepath.Base(path)},
+			ObjectMeta: yaml.ObjectMeta{
+				NameMeta: yaml.NameMeta{
+					Name: filepath.Base(path)},
+			},
+			TypeMeta: yaml.TypeMeta{
+				Kind: "Kptfile",
+			},
 		},
 		Upstream: kptfile.Upstream{
 			Type:  kptfile.StdinOrigin,