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

add MakeHashTransformer in TransformerFactory; remove hash interface

Browse Source
This commit is contained in:
Jingfang Liu
2018-10-10 13:09:01 -07:00
parent 681e2bf213
commit 2953dad221
16 changed files with 88 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/commands/build/build.go
View File

@@ -25,7 +25,7 @@ import (
"sigs.k8s.io/kustomize/pkg/constants"
"sigs.k8s.io/kustomize/pkg/fs"
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/ifc/patch"
"sigs.k8s.io/kustomize/pkg/ifc/transformer"
"sigs.k8s.io/kustomize/pkg/loader"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
@@ -63,8 +63,7 @@ Use different transformer configurations by passing files to kustomize
func NewCmdBuild(
out io.Writer, fs fs.FileSystem,
kf ifc.KunstructuredFactory,
ptf patch.TransformerFactory,
hash ifc.Hash) *cobra.Command {
ptf transformer.Factory) *cobra.Command {
var o buildOptions
var p string
@@ -78,7 +77,7 @@ func NewCmdBuild(
if err != nil {
return err
}
return o.RunBuild(out, fs, kf, ptf, hash)
return o.RunBuild(out, fs, kf, ptf)
},
}
cmd.Flags().StringVarP(
@@ -124,8 +123,7 @@ func (o *buildOptions) Validate(args []string, p string, fs fs.FileSystem) error
func (o *buildOptions) RunBuild(
out io.Writer, fSys fs.FileSystem,
kf ifc.KunstructuredFactory,
ptf patch.TransformerFactory,
hash ifc.Hash) error {
ptf transformer.Factory) error {
rootLoader, err := loader.NewLoader(o.kustomizationPath, "", fSys)
if err != nil {
return err
@@ -138,7 +136,7 @@ func (o *buildOptions) RunBuild(
kt, err := target.NewKustTarget(
rootLoader, fSys,
resmap.NewFactory(resource.NewFactory(kf)),
ptf, tc, hash)
ptf, tc)
if err != nil {
return err
}

5
pkg/commands/build/build_test.go
View File

@@ -27,7 +27,7 @@ import (
"github.com/ghodss/yaml"
"sigs.k8s.io/kustomize/internal/k8sdeps"
"sigs.k8s.io/kustomize/internal/k8sdeps/patch"
"sigs.k8s.io/kustomize/internal/k8sdeps/transformer"
"sigs.k8s.io/kustomize/pkg/commands/kustfile"
"sigs.k8s.io/kustomize/pkg/constants"
"sigs.k8s.io/kustomize/pkg/fs"
@@ -132,8 +132,7 @@ func runBuildTestCase(t *testing.T, testcaseName string, updateKustomizeExpected
err = ops.RunBuild(
buf, fSys,
k8sdeps.NewKunstructuredFactoryImpl(),
patch.NewPatchTransformerFactory(),
k8sdeps.NewKustHash())
transformer.NewFactoryImpl())
switch {
case err != nil && len(testcase.ExpectedError) == 0:
t.Errorf("unexpected error: %v", err)