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

upgrade to helm 3.5.4 and imdario/mergo v0.3.12

Browse Source
This commit is contained in:
monopole
2021-04-09 15:01:48 -07:00
parent 264b3ff338
commit aa5b4814d6
39 changed files with 120 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/internal/plugins/execplugin/execplugin_test.go
View File

@@ -45,7 +45,8 @@ s/$BAR/bar baz/g
})
pluginConfig.RemoveBuildAnnotations()
loader := pLdr.NewLoader(types.DisabledPluginConfig(), rf, fSys)
pc := types.DisabledPluginConfig()
loader := pLdr.NewLoader(pc, rf, fSys)
pluginPath, err := loader.AbsolutePluginPath(pluginConfig.OrgId())
if err != nil {
t.Fatalf("unexpected err: %v", err)
@@ -61,7 +62,9 @@ s/$BAR/bar baz/g
if err != nil {
t.Fatalf("unexpected err: %v", err)
}
p.Config(resmap.NewPluginHelpers(ldr, pvd.GetFieldValidator(), rf), yaml)
p.Config(
resmap.NewPluginHelpers(ldr, pvd.GetFieldValidator(), rf, pc),
yaml)
expected := "someteam.example.com/v1/sedtransformer/SedTransformer"
if !strings.HasSuffix(p.Path(), expected) {

7
api/internal/plugins/loader/loader.go
View File

@@ -42,6 +42,11 @@ func NewLoader(
return &Loader{pc: pc, rf: rf, fs: fs}
}
// Config provides the global (not plugin specific) PluginConfig data.
func (l *Loader) Config() *types.PluginConfig {
return l.pc
}
func (l *Loader) LoadGenerators(
ldr ifc.Loader, v ifc.Validator, rm resmap.ResMap) ([]resmap.Generator, error) {
var result []resmap.Generator
@@ -188,7 +193,7 @@ func (l *Loader) loadAndConfigurePlugin(
if err != nil {
return nil, errors.Wrapf(err, "marshalling yaml from res %s", res.OrgId())
}
err = c.Config(resmap.NewPluginHelpers(ldr, v, l.rf), yaml)
err = c.Config(resmap.NewPluginHelpers(ldr, v, l.rf, l.pc), yaml)
if err != nil {
return nil, errors.Wrapf(
err, "plugin %s fails configuration", res.OrgId())