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

Move hashing transformer out of k8sdeps.

Browse Source
This commit is contained in:
Jeffrey Regan
2019-05-29 10:01:52 -07:00
parent 4812ddff9f
commit fd2248e7c2
14 changed files with 205 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/target/kusttarget.go
View File

@@ -21,6 +21,7 @@ import (
"sigs.k8s.io/kustomize/pkg/transformers"
"sigs.k8s.io/kustomize/pkg/transformers/config"
"sigs.k8s.io/kustomize/pkg/types"
"sigs.k8s.io/kustomize/plugin/builtin"
"sigs.k8s.io/yaml"
)
@@ -126,10 +127,18 @@ func (kt *KustTarget) makeCustomizedResMap(
if err != nil {
return nil, err
}
err = ra.Transform(kt.tFactory.MakeHashTransformer())
// This must be done last, and not as part of
// the recursion implicit in AccumulateTarget.
p := builtin.NewHashTransformerPlugin()
err = kt.configureBuiltinPlugin(p, nil, "hash")
if err != nil {
return nil, err
}
err = ra.Transform(p)
if err != nil {
return nil, err
}
// Given that names have changed (prefixs/suffixes added),
// fix all the back references to those names.
err = ra.FixBackReferences()

12
pkg/target/kusttarget_configplugin.go
View File

@@ -234,10 +234,14 @@ func (kt *KustTarget) configureBuiltinImageTagTransformer(
}
func (kt *KustTarget) configureBuiltinPlugin(
p plugins.Configurable, c interface{}, id string) error {
y, err := yaml.Marshal(c)
if err != nil {
return errors.Wrapf(err, "builtin %s marshal", id)
p plugins.Configurable, c interface{}, id string) (err error) {
var y []byte
if c != nil {
y, err = yaml.Marshal(c)
if err != nil {
return errors.Wrapf(
err, "builtin %s marshal", id)
}
}
err = p.Config(kt.ldr, kt.rFactory, y)
if err != nil {