allow general name and kind changes via an options field in patches

kubernetes-sigs · Mar 10, 2021 · f96ac2d · f96ac2d
1 parent bab8c34
commit f96ac2d
Show file tree

Hide file tree

Showing 17 changed files with 283 additions and 144 deletions.
diff --git a/api/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go
diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go
@@ -352,6 +352,7 @@ func TestResolveVarsWithNoambiguation(t *testing.T) {
 			"metadata": map[string]interface{}{
 				"name": "sub-backendOne",
 				"annotations": map[string]interface{}{
+					"config.kubernetes.io/previousKinds":      "Service",
 					"config.kubernetes.io/previousNames":      "backendOne",
 					"config.kubernetes.io/previousNamespaces": "default",
 					"config.kubernetes.io/prefixes":           "sub-",

diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go
@@ -201,14 +201,16 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 			return
 		}
 		var c struct {
-			Path   string          `json:"path,omitempty" yaml:"path,omitempty"`
-			Patch  string          `json:"patch,omitempty" yaml:"patch,omitempty"`
-			Target *types.Selector `json:"target,omitempty" yaml:"target,omitempty"`
+			Path    string          `json:"path,omitempty" yaml:"path,omitempty"`
+			Patch   string          `json:"patch,omitempty" yaml:"patch,omitempty"`
+			Target  *types.Selector `json:"target,omitempty" yaml:"target,omitempty"`
+			Options map[string]bool `json:"options,omitempty" yaml:"options,omitempty"`
 		}
 		for _, pc := range kt.kustomization.Patches {
 			c.Target = pc.Target
 			c.Patch = pc.Patch
 			c.Path = pc.Path
+			c.Options = pc.Options
 			p := f()
 			err = kt.configureBuiltinPlugin(p, c, bpt)
 			if err != nil {