not delete kustomize.config.k8s.io/needs-hash

kubernetes-sigs · Sep 9, 2023 · 98cc766 · 98cc766
1 parent 7c36ed2
commit 98cc766
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/api/krusty/configmaps_test.go b/api/krusty/configmaps_test.go
@@ -291,6 +291,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
@@ -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