change packages to bases in Manifest

cmd/kinflate/longerDemo/instances/production.md

@@ -22,7 +22,7 @@ objectLabels:
 objectAnnotations:
   note: Hello, I am production!
 
-packages:
+bases:
 - ..
 
 patches:

cmd/kinflate/longerDemo/instances/staging.md

@@ -22,7 +22,7 @@ objectLabels:
 objectAnnotations:
   note: Hello, I am staging!
 
-packages:
+bases:
 - ..
 
 patches:

pkg/apis/manifest/v1alpha1/types.go

@@ -82,10 +82,10 @@ type Manifest struct {
 	// Annotations to add to all objects.
 	ObjectAnnotations map[string]string `json:"objectAnnotations,omitempty" yaml:"objectAnnotations,omitempty"`
 
-	// Packages contain the paths to other packages that this manifest depends on.
+	// Bases contain the paths to other packages that this manifest depends on.
 	// Each path should be either a path to a Kube-manifest.yaml or a path of
 	// a directory that contains a Kube-manifest.yaml file.
-	Packages []string `json:"packages,omitempty" yaml:"packages,omitempty"`
+	Bases []string `json:"bases,omitempty" yaml:"bases,omitempty"`
 
 	// Resources specifies the relative paths within the package.
 	// It could be any format that kubectl -f allows, i.e. files, directories,

pkg/kinflate/app/application.go

@@ -151,7 +151,7 @@ func (a *applicationImpl) RawResources() (resource.ResourceCollection, error) {
 func (a *applicationImpl) subAppResources() (resource.ResourceCollection, *interror.ManifestErrors) {
 	sliceOfSubAppResources := []resource.ResourceCollection{}
 	errs := &interror.ManifestErrors{}
-	for _, pkgPath := range a.manifest.Packages {
+	for _, pkgPath := range a.manifest.Bases {
 		subloader, err := a.loader.New(pkgPath)
 		if err != nil {
 			errs.Append(err)

pkg/kinflate/commands/testdata/testcase-single-overlay/in/overlay/Kube-manifest.yaml

@@ -8,7 +8,7 @@ objectLabels:
   env: staging
 patches:
   - deployment.yaml
-packages:
+bases:
   - ../package/
 configmaps:
   - name: configmap-in-overlay

pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml

@@ -15,7 +15,7 @@ objectLabels:
   repo: test-infra
 objectAnnotations:
   note: This is a test annotation
-packages:
+bases:
 - ../../package/
 #These are strategic merge patch overlays in the form of API resources
 patches: