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

remove decoder interface since it is only used inside k8sdeps

Browse Source
This commit is contained in:
Jingfang Liu
2018-10-10 11:08:23 -07:00
parent cf4a1ba083
commit 96091dfcf5
22 changed files with 35 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/target/kusttarget.go
View File

@@ -43,7 +43,6 @@ import (
// KustTarget encapsulates the entirety of a kustomization build.
type KustTarget struct {
kustomization *types.Kustomization
decoder ifc.Decoder
hash ifc.Hash
ldr ifc.Loader
fSys fs.FileSystem
@@ -58,7 +57,7 @@ func NewKustTarget(
rf *resmap.Factory,
ptf patch.TransformerFactory,
tcfg *transformerconfig.TransformerConfig,
d ifc.Decoder, h ifc.Hash) (*KustTarget, error) {
h ifc.Hash) (*KustTarget, error) {
content, err := ldr.Load(constants.KustomizationFileName)
if err != nil {
return nil, err
@@ -76,7 +75,6 @@ func NewKustTarget(
fSys: fSys,
rf: rf,
tcfg: tcfg,
decoder: d,
hash: h,
ptf: ptf,
}, nil
@@ -227,7 +225,7 @@ func (kt *KustTarget) loadCustomizedBases() (resmap.ResMap, *interror.Kustomizat
continue
}
target, err := NewKustTarget(
ldr, kt.fSys, kt.rf, kt.ptf, kt.tcfg, kt.decoder, kt.hash)
ldr, kt.fSys, kt.rf, kt.ptf, kt.tcfg, kt.hash)
if err != nil {
errs.Append(errors.Wrap(err, "couldn't make target for "+path))
continue
@@ -257,7 +255,7 @@ func (kt *KustTarget) loadBasesAsFlatList() ([]*KustTarget, error) {
continue
}
target, err := NewKustTarget(
ldr, kt.fSys, kt.rf, kt.ptf, kt.tcfg, kt.decoder, kt.hash)
ldr, kt.fSys, kt.rf, kt.ptf, kt.tcfg, kt.hash)
if err != nil {
errs.Append(err)
continue

8
pkg/target/kusttarget_test.go
View File

@@ -89,7 +89,7 @@ metadata:
)
var rf = resmap.NewFactory(resource.NewFactory(
k8sdeps.NewKunstructuredFactoryImpl(k8sdeps.NewKustDecoder())))
k8sdeps.NewKunstructuredFactoryImpl()))
func makeLoader1(t *testing.T) ifc.Loader {
ldr := loadertest.NewFakeLoader("/testpath")
@@ -212,7 +212,7 @@ func TestResources1(t *testing.T) {
kt, err := NewKustTarget(
l, fakeFs, rf, patch.NewPatchTransformerFactory(),
transformerconfig.MakeDefaultTransformerConfig(),
k8sdeps.NewKustDecoder(), k8sdeps.NewKustHash())
k8sdeps.NewKustHash())
if err != nil {
t.Fatalf("unexpected construction error %v", err)
}
@@ -238,7 +238,7 @@ func TestResourceNotFound(t *testing.T) {
kt, err := NewKustTarget(
l, fakeFs, rf, patch.NewPatchTransformerFactory(),
transformerconfig.MakeDefaultTransformerConfig(),
k8sdeps.NewKustDecoder(), k8sdeps.NewKustHash())
k8sdeps.NewKustHash())
if err != nil {
t.Fatalf("Unexpected construction error %v", err)
}
@@ -262,7 +262,7 @@ func TestSecretTimeout(t *testing.T) {
kt, err := NewKustTarget(
l, fakeFs, rf, patch.NewPatchTransformerFactory(),
transformerconfig.MakeDefaultTransformerConfig(),
k8sdeps.NewKustDecoder(), k8sdeps.NewKustHash())
k8sdeps.NewKustHash())
if err != nil {
t.Fatalf("Unexpected construction error %v", err)
}