From 23963e854ab743a6f545210aaf7aa19087146245 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Fri, 19 Oct 2018 14:44:23 -0700 Subject: [PATCH] skip hash transformer when DisableHash is set to true --- pkg/target/kusttarget.go | 8 +++++--- pkg/target/kusttarget_test.go | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 8283d3832..8a81b7b44 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -99,9 +99,11 @@ func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) { // resolveRefsToGeneratedResources fixes all name references. func (kt *KustTarget) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) { - err := kt.ptf.MakeHashTransformer().Transform(m) - if err != nil { - return nil, err + if kt.kustomization.GeneratorOptions == nil || !kt.kustomization.GeneratorOptions.DisableHash { + err := kt.ptf.MakeHashTransformer().Transform(m) + if err != nil { + return nil, err + } } var r []transformers.Transformer diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 44c146892..f33842735 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -33,6 +33,7 @@ import ( "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/transformers/config" + "sigs.k8s.io/kustomize/pkg/types" ) const ( @@ -259,3 +260,18 @@ func TestSecretTimeout(t *testing.T) { t.Fatalf("unexpected error: %q", err) } } + +func TestDisableHash(t *testing.T) { + kt := makeKustTarget(t, makeLoader1(t)) + kt.kustomization.GeneratorOptions = &types.GeneratorOptions{DisableHash: true} + actual, err := kt.MakeCustomizedResMap() + if err != nil { + t.Fatalf("unexpected Resources error %v", err) + } + + for id, r := range actual { + if !strings.HasSuffix(r.GetName(), id.Name()) { + t.Fatalf("unexpected hash was added to %s: %s", id.Name(), r.GetName()) + } + } +}