Skip to content

Commit 23963e8

Browse files
committed
skip hash transformer when DisableHash is set to true
1 parent 04167cf commit 23963e8

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

pkg/target/kusttarget.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,11 @@ func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
9999

100100
// resolveRefsToGeneratedResources fixes all name references.
101101
func (kt *KustTarget) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) {
102-
err := kt.ptf.MakeHashTransformer().Transform(m)
103-
if err != nil {
104-
return nil, err
102+
if kt.kustomization.GeneratorOptions == nil || !kt.kustomization.GeneratorOptions.DisableHash {
103+
err := kt.ptf.MakeHashTransformer().Transform(m)
104+
if err != nil {
105+
return nil, err
106+
}
105107
}
106108

107109
var r []transformers.Transformer

pkg/target/kusttarget_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"sigs.k8s.io/kustomize/pkg/resmap"
3434
"sigs.k8s.io/kustomize/pkg/resource"
3535
"sigs.k8s.io/kustomize/pkg/transformers/config"
36+
"sigs.k8s.io/kustomize/pkg/types"
3637
)
3738

3839
const (
@@ -259,3 +260,18 @@ func TestSecretTimeout(t *testing.T) {
259260
t.Fatalf("unexpected error: %q", err)
260261
}
261262
}
263+
264+
func TestDisableHash(t *testing.T) {
265+
kt := makeKustTarget(t, makeLoader1(t))
266+
kt.kustomization.GeneratorOptions = &types.GeneratorOptions{DisableHash: true}
267+
actual, err := kt.MakeCustomizedResMap()
268+
if err != nil {
269+
t.Fatalf("unexpected Resources error %v", err)
270+
}
271+
272+
for id, r := range actual {
273+
if !strings.HasSuffix(r.GetName(), id.Name()) {
274+
t.Fatalf("unexpected hash was added to %s: %s", id.Name(), r.GetName())
275+
}
276+
}
277+
}

0 commit comments

Comments
 (0)