diff --git a/api/krusty/configmaps_test.go b/api/krusty/configmaps_test.go index 251d6d82511..d2421cb0e65 100644 --- a/api/krusty/configmaps_test.go +++ b/api/krusty/configmaps_test.go @@ -278,6 +278,8 @@ resources: configMapGenerator: - name: project behavior: merge + options: + disableNameSuffixHash: true literals: - ANOTHER_ENV_VARIABLE="bar" `) diff --git a/api/resource/resource.go b/api/resource/resource.go index ae1a98be0ef..b14395498e3 100644 --- a/api/resource/resource.go +++ b/api/resource/resource.go @@ -523,6 +523,9 @@ func mergeStringMapsWithBuildAnnotations(maps ...map[string]string) map[string]s result := mergeStringMaps(maps...) for i := range BuildAnnotations { if len(maps) > 0 { + if BuildAnnotations[i] == utils.BuildAnnotationsGenAddHashSuffix { + continue + } if v, ok := maps[0][BuildAnnotations[i]]; ok { result[BuildAnnotations[i]] = v continue