kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-10 16:42:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #493 from Liujingfang1/options

Browse Source 
skip hash transformer when DisableHash is set to true
This commit is contained in:
k8s-ci-robot
2018-10-19 15:25:14 -07:00
committed by GitHub
parent 04167cf77e 23963e854a
commit 8b09afdf3e
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/target/kusttarget.go
View File

@@ -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

16
pkg/target/kusttarget_test.go
View File

@@ -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())
}
}
}