diff --git a/cmd/kinflate/longerDemo/instances/production.md b/cmd/kinflate/longerDemo/instances/production.md index 75046f187..341c0fcaf 100644 --- a/cmd/kinflate/longerDemo/instances/production.md +++ b/cmd/kinflate/longerDemo/instances/production.md @@ -22,7 +22,7 @@ objectLabels: objectAnnotations: note: Hello, I am production! -packages: +bases: - .. patches: diff --git a/cmd/kinflate/longerDemo/instances/staging.md b/cmd/kinflate/longerDemo/instances/staging.md index 75eb3f511..4dc25d57d 100644 --- a/cmd/kinflate/longerDemo/instances/staging.md +++ b/cmd/kinflate/longerDemo/instances/staging.md @@ -22,7 +22,7 @@ objectLabels: objectAnnotations: note: Hello, I am staging! -packages: +bases: - .. patches: diff --git a/pkg/apis/manifest/v1alpha1/types.go b/pkg/apis/manifest/v1alpha1/types.go index f3b9e8ca7..b2c51d2f7 100644 --- a/pkg/apis/manifest/v1alpha1/types.go +++ b/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, diff --git a/pkg/kinflate/app/application.go b/pkg/kinflate/app/application.go index 4662c55bf..0d00d2b5e 100644 --- a/pkg/kinflate/app/application.go +++ b/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) diff --git a/pkg/kinflate/commands/testdata/testcase-single-overlay/in/overlay/Kube-manifest.yaml b/pkg/kinflate/commands/testdata/testcase-single-overlay/in/overlay/Kube-manifest.yaml index 2ec6d0a6a..965075872 100644 --- a/pkg/kinflate/commands/testdata/testcase-single-overlay/in/overlay/Kube-manifest.yaml +++ b/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 diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml b/pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml index 14f3e376b..c07964a7b 100644 --- a/pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml +++ b/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: