kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-16 09:30:56 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

kustomize.yaml becomes kustomization.yaml

Browse Source
This commit is contained in:
Jeffrey Regan
2018-04-17 11:16:49 -07:00
parent da0682cdeb
commit 4d2b8d4e1d
22 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/application.go
View File

@@ -213,13 +213,13 @@ func (a *applicationImpl) getTransformer(patches []*resource.Resource) (transfor
}
ts = append(ts, npt)
lt, err := transformers.NewDefaultingLabelsMapTransformer(a.kustomization.LabelsToAdd)
lt, err := transformers.NewDefaultingLabelsMapTransformer(a.kustomization.CommonLabels)
if err != nil {
return nil, err
}
ts = append(ts, lt)
at, err := transformers.NewDefaultingAnnotationsMapTransformer(a.kustomization.AnnotationsToAdd)
at, err := transformers.NewDefaultingAnnotationsMapTransformer(a.kustomization.CommonAnnotations)
if err != nil {
return nil, err
}

7
app/application_test.go
View File

@@ -25,6 +25,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader"
@@ -34,9 +35,9 @@ import (
func setupTest(t *testing.T) loader.Loader {
kustomizationContent := []byte(`
namePrefix: foo-
labelsToAdd:
commonLabels:
app: nginx
annotationsToAdd:
commonAnnotations:
note: This is a test annotation
resources:
- deployment.yaml
@@ -59,7 +60,7 @@ metadata:
`)
loader := loadertest.NewFakeLoader("/testpath")
err := loader.AddFile("/testpath/kustomize.yaml", kustomizationContent)
err := loader.AddFile("/testpath/"+constants.KustomizationFileName, kustomizationContent)
if err != nil {
t.Fatalf("Failed to setup fake loader.")
}