Merge remote-tracking branch 'origin/master' into issue5540

2026-06-11 00:52:55 +00:00 · 2024-03-08 14:48:51 -05:00
parent 62eca858f3 11704312be
commit 4da880d6cb
110 changed files with 944 additions and 262 deletions
--- a/api/internal/target/kusttarget_test.go
+++ b/api/internal/target/kusttarget_test.go
@@ -315,19 +315,21 @@ configurations:
 	th.WriteF("/merge-config/name-prefix-rules.yaml", `
 namePrefix:
 - path: metadata/name
-  apiVersion: v1
+  group: apps
+  version: v1
  kind: Deployment
 - path: metadata/name
-  apiVersion: v1
+  version: v1
  kind: Secret
 `)
 	th.WriteF("/merge-config/name-suffix-rules.yaml", `
 nameSuffix:
 - path: metadata/name
-  apiVersion: v1
+  version: v1
  kind: ConfigMap
 - path: metadata/name
-  apiVersion: v1
+  group: apps
+  version: v1
  kind: Deployment
 `)
 	th.WriteF("/merge-config/deployment.yaml", `