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

Rename disableHash to disableNameSuffixHash

Browse Source
This commit is contained in:
Jeffrey Regan
2018-10-30 11:36:00 -07:00
parent 40e0bbeec2
commit a8fbe35ecf
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/kustfile/kustomizationfile_test.go
View File

@@ -241,7 +241,7 @@ patchesStrategicMerge:
- pod.yaml - pod.yaml
# generator options # generator options
generatorOptions: generatorOptions:
disableHash: true disableNameSuffixHash: true
`) `)
expected := []byte(` expected := []byte(`
@@ -279,7 +279,7 @@ patchesStrategicMerge:
- pod.yaml - pod.yaml
# generator options # generator options
generatorOptions: generatorOptions:
disableHash: true disableNameSuffixHash: true
`) `)
fSys := fs.MakeFakeFS() fSys := fs.MakeFakeFS()
fSys.WriteTestKustomizationWith(kustomizationContentWithComments) fSys.WriteTestKustomizationWith(kustomizationContentWithComments)

2
pkg/target/kusttarget.go
View File

@@ -100,7 +100,7 @@ func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
// resolveRefsToGeneratedResources fixes all name references. // resolveRefsToGeneratedResources fixes all name references.
func (kt *KustTarget) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) { func (kt *KustTarget) resolveRefsToGeneratedResources(m resmap.ResMap) (resmap.ResMap, error) {
if kt.kustomization.GeneratorOptions == nil || !kt.kustomization.GeneratorOptions.DisableHash { if kt.kustomization.GeneratorOptions == nil || !kt.kustomization.GeneratorOptions.DisableNameSuffixHash {
err := kt.ptf.MakeHashTransformer().Transform(m) err := kt.ptf.MakeHashTransformer().Transform(m)
if err != nil { if err != nil {
return nil, err return nil, err

4
pkg/target/kusttarget_test.go
View File

@@ -261,9 +261,9 @@ func TestSecretTimeout(t *testing.T) {
} }
} }
func TestDisableHash(t *testing.T) { func TestDisableNameSuffixHash(t *testing.T) {
kt := makeKustTarget(t, makeLoader1(t)) kt := makeKustTarget(t, makeLoader1(t))
kt.kustomization.GeneratorOptions = &types.GeneratorOptions{DisableHash: true} kt.kustomization.GeneratorOptions = &types.GeneratorOptions{DisableNameSuffixHash: true}
actual, err := kt.MakeCustomizedResMap() actual, err := kt.MakeCustomizedResMap()
if err != nil { if err != nil {
t.Fatalf("unexpected Resources error %v", err) t.Fatalf("unexpected Resources error %v", err)

4
pkg/types/kustomization.go
View File

@@ -249,8 +249,8 @@ type GeneratorOptions struct {
// resource generation. Default at time of writing: {'sh', '-c'}. // resource generation. Default at time of writing: {'sh', '-c'}.
Shell []string `json:"shell,omitempty" yaml:"shell,omitempty"` Shell []string `json:"shell,omitempty" yaml:"shell,omitempty"`
// DisableNameHash if true disables the default behavior of adding a // DisableNameSuffixHash if true disables the default behavior of adding a
// suffix to the names of generated resources that is a hash of the // suffix to the names of generated resources that is a hash of the
// resource contents. // resource contents.
DisableHash bool `json:"disableHash,omitempty" yaml:"disableHash,omitempty"` DisableNameSuffixHash bool `json:"disableNameSuffixHash,omitempty" yaml:"disableNameSuffixHash,omitempty"`
} }