kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-30 01:46:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Consolidate transformer config creation to factory.

Browse Source
This commit is contained in:
Jeffrey Regan
2018-10-10 11:03:18 -07:00
parent bb9435a604
commit 2283c06971
13 changed files with 207 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/transformers/labelsandannotations_test.go
View File

@@ -41,8 +41,8 @@ var pvc = gvk.Gvk{Version: "v1", Kind: "PersistentVolumeClaim"}
var crb = gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}
var sa = gvk.Gvk{Version: "v1", Kind: "ServiceAccount"}
var ingress = gvk.Gvk{Kind: "Ingress"}
var rf = resource.NewFactory(
k8sdeps.NewKunstructuredFactoryImpl())
var rf = resource.NewFactory(k8sdeps.NewKunstructuredFactoryImpl())
var defaultTransformerConfig = transformerconfig.NewFactory(nil).DefaultConfig()
func TestLabelsRun(t *testing.T) {
m := resmap.ResMap{
@@ -419,7 +419,7 @@ func TestLabelsRun(t *testing.T) {
}
lt, err := NewLabelsMapTransformer(
map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"},
transformerconfig.MakeDefaultTransformerConfig().CommonLabels)
defaultTransformerConfig.CommonLabels)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -556,7 +556,7 @@ func TestAnnotationsRun(t *testing.T) {
}
at, err := NewAnnotationsMapTransformer(
map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"},
transformerconfig.MakeDefaultTransformerConfig().CommonAnnotations)
defaultTransformerConfig.CommonAnnotations)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

3
pkg/transformers/namereference_test.go
View File

@@ -24,7 +24,6 @@ import (
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformerconfig"
)
func TestNameReferenceRun(t *testing.T) {
@@ -326,7 +325,7 @@ func TestNameReferenceRun(t *testing.T) {
},
},
)
nrt, err := NewNameReferenceTransformer(transformerconfig.MakeDefaultTransformerConfig().NameReference)
nrt, err := NewNameReferenceTransformer(defaultTransformerConfig.NameReference)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

3
pkg/transformers/namespace_test.go
View File

@@ -24,7 +24,6 @@ import (
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformerconfig"
)
func TestNamespaceRun(t *testing.T) {
@@ -188,7 +187,7 @@ func TestNamespaceRun(t *testing.T) {
}),
}
nst := NewNamespaceTransformer("test", transformerconfig.MakeDefaultTransformerConfig().NameSpace)
nst := NewNamespaceTransformer("test", defaultTransformerConfig.NameSpace)
err := nst.Transform(m)
if err != nil {
t.Fatalf("unexpected error: %v", err)

3
pkg/transformers/prefixname_test.go
View File

@@ -24,7 +24,6 @@ import (
"sigs.k8s.io/kustomize/pkg/resid"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/kustomize/pkg/transformerconfig"
)
func TestPrefixNameRun(t *testing.T) {
@@ -84,7 +83,7 @@ func TestPrefixNameRun(t *testing.T) {
}
npt, err := NewNamePrefixTransformer(
"someprefix-", transformerconfig.MakeDefaultTransformerConfig().NamePrefix)
"someprefix-", defaultTransformerConfig.NamePrefix)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}