kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change packages to bases in Manifest

This commit is contained in:
Jingfang Liu 2018-03-22 09:27:46 -07:00
parent c8107f2ffc
commit f24ba4e2ee
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kinflate/longerDemo/instances/production.md
View File

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

2
cmd/kinflate/longerDemo/instances/staging.md
View File

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

4
pkg/apis/manifest/v1alpha1/types.go
View File

@ -82,10 +82,10 @@ type Manifest struct {
// Annotations to add to all objects. // Annotations to add to all objects.
ObjectAnnotations map[string]string `json:"objectAnnotations,omitempty" yaml:"objectAnnotations,omitempty"` 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 // 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. // 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. // Resources specifies the relative paths within the package.
// It could be any format that kubectl -f allows, i.e. files, directories, // It could be any format that kubectl -f allows, i.e. files, directories,

2
pkg/kinflate/app/application.go
View File

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

2
pkg/kinflate/commands/testdata/testcase-single-overlay/in/overlay/Kube-manifest.yaml vendored
View File

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

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

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