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

Merge pull request #3792 from monopole/nits

Browse Source 
Fix nits, add internal GetRoot func.
This commit is contained in:
Jeff Regan
2021-04-12 07:53:00 -07:00
committed by GitHub
parent 9d50890174 9c43518a15
commit aeba50488b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/internal/target/kusttarget_configplugin.go
View File

@@ -112,7 +112,8 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func(
return return
}, },
builtinhelpers.HelmChartInflationGenerator: func(kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) ( builtinhelpers.HelmChartInflationGenerator: func(
kt *KustTarget, bpt builtinhelpers.BuiltinPluginType, f gFactory) (
result []resmap.Generator, err error) { result []resmap.Generator, err error) {
var c struct { var c struct {
types.HelmChartArgs types.HelmChartArgs
@@ -120,8 +121,7 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func(
for _, args := range kt.kustomization.HelmChartInflationGenerator { for _, args := range kt.kustomization.HelmChartInflationGenerator {
c.HelmChartArgs = args c.HelmChartArgs = args
p := f() p := f()
err := kt.configureBuiltinPlugin(p, c, bpt) if err = kt.configureBuiltinPlugin(p, c, bpt); err != nil {
if err != nil {
return nil, err return nil, err
} }
result = append(result, p) result = append(result, p)

4
api/testutils/kusttest/harnessenhanced.go
View File

@@ -83,6 +83,10 @@ func makeBaseEnhancedHarness(t *testing.T) *HarnessEnhanced {
filesys.MakeFsOnDisk())} filesys.MakeFsOnDisk())}
} }
func (th *HarnessEnhanced) GetRoot() string {
return th.ldr.Root()
}
func (th *HarnessEnhanced) Reset() { func (th *HarnessEnhanced) Reset() {
if th.shouldWipeLdrRoot { if th.shouldWipeLdrRoot {
if !strings.HasPrefix(th.ldr.Root(), os.TempDir()) { if !strings.HasPrefix(th.ldr.Root(), os.TempDir()) {