Merge pull request #1280 from sethpollack/generator_metadata

use ObjectMeta

pkg/target/kusttarget.go

@@ -184,8 +184,7 @@ func (kt *KustTarget) computeInventory(
 	p := builtin.NewInventoryTransformerPlugin()
 	var c struct {
 		Policy           string
-		Name      string
+		types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-		Namespace string
 	}
 	c.Name = inv.ConfigMap.Name
 	c.Namespace = inv.ConfigMap.Namespace

pkg/target/kusttarget_configplugin.go

@@ -129,7 +129,7 @@ func (kt *KustTarget) configureBuiltinNamespaceTransformer(
 	tConfig *config.TransformerConfig) (
 	result []transformers.Transformer, err error) {
 	var c struct {
-		Namespace  string
+		types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
 		FieldSpecs       []config.FieldSpec
 	}
 	c.Namespace = kt.kustomization.Namespace

plugin/builtin/ConfigMapGenerator.go

@@ -11,6 +11,7 @@ import (
 type ConfigMapGeneratorPlugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	types.GeneratorOptions
 	types.ConfigMapArgs
 }
@@ -25,6 +26,12 @@ func (p *ConfigMapGeneratorPlugin) Config(
 	p.GeneratorOptions = types.GeneratorOptions{}
 	p.ConfigMapArgs = types.ConfigMapArgs{}
 	err = yaml.Unmarshal(config, p)
+	if p.ConfigMapArgs.Name == "" {
+		p.ConfigMapArgs.Name = p.Name
+	}
+	if p.ConfigMapArgs.Namespace == "" {
+		p.ConfigMapArgs.Namespace = p.Namespace
+	}
 	p.ldr = ldr
 	p.rf = rf
 	return

plugin/builtin/InventoryTransformer.go

@@ -18,9 +18,8 @@ import (
 type InventoryTransformerPlugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	Policy           string `json:"policy,omitempty" yaml:"policy,omitempty"`
-	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable

plugin/builtin/NamespaceTransformer.go

@@ -9,12 +9,13 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
+	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/yaml"
 )
 
 // Change or set the namespace of non-cluster level resources.
 type NamespaceTransformerPlugin struct {
-	Namespace  string             `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	FieldSpecs       []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 

plugin/builtin/SecretGenerator.go

@@ -11,6 +11,7 @@ import (
 type SecretGeneratorPlugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	types.GeneratorOptions
 	types.SecretArgs
 }
@@ -25,6 +26,12 @@ func (p *SecretGeneratorPlugin) Config(
 	p.GeneratorOptions = types.GeneratorOptions{}
 	p.SecretArgs = types.SecretArgs{}
 	err = yaml.Unmarshal(config, p)
+	if p.SecretArgs.Name == "" {
+		p.SecretArgs.Name = p.Name
+	}
+	if p.SecretArgs.Namespace == "" {
+		p.SecretArgs.Namespace = p.Namespace
+	}
 	p.ldr = ldr
 	p.rf = rf
 	return

plugin/builtin/configmapgenerator/ConfigMapGenerator.go

@@ -14,6 +14,7 @@ import (
 type plugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	types.GeneratorOptions
 	types.ConfigMapArgs
 }
@@ -26,6 +27,12 @@ func (p *plugin) Config(
 	p.GeneratorOptions = types.GeneratorOptions{}
 	p.ConfigMapArgs = types.ConfigMapArgs{}
 	err = yaml.Unmarshal(config, p)
+	if p.ConfigMapArgs.Name == "" {
+		p.ConfigMapArgs.Name = p.Name
+	}
+	if p.ConfigMapArgs.Namespace == "" {
+		p.ConfigMapArgs.Namespace = p.Namespace
+	}
 	p.ldr = ldr
 	p.rf = rf
 	return

plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go

@@ -30,7 +30,6 @@ COLOR=red
 apiVersion: builtin
 kind: ConfigMapGenerator
 metadata:
-  name: myMapGen
   name: myMap
 envs:
 - devops.env

plugin/builtin/inventorytransformer/InventoryTransformer.go

@@ -21,9 +21,8 @@ import (
 type plugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	Policy           string `json:"policy,omitempty" yaml:"policy,omitempty"`
-	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 }
 
 //noinspection GoUnusedGlobalVariable

plugin/builtin/inventorytransformer/InventoryTransformer_test.go

@@ -71,10 +71,9 @@ func TestInventoryTransformerCollect(t *testing.T) {
 apiVersion: builtin
 kind: InventoryTransformer
 metadata:
-  name: notImportantHere
-policy: GarbageCollect
   name: pruneCM
   namespace: default
+policy: GarbageCollect
 `, content)
 
 	th.AssertActualEqualsExpected(rm, inv)
@@ -93,10 +92,9 @@ func TestInventoryTransformerIgnore(t *testing.T) {
 apiVersion: builtin
 kind: InventoryTransformer
 metadata:
-  name: notImportantHere
-policy: GarbageIgnore
   name: pruneCM
   namespace: default
+policy: GarbageIgnore
 `, content)
 
 	th.AssertActualEqualsExpected(rm, content+"---"+inv)
@@ -115,7 +113,6 @@ func TestInventoryTransformerDefaultPolicy(t *testing.T) {
 apiVersion: builtin
 kind: InventoryTransformer
 metadata:
-  name: notImportantHere
   name: pruneCM
   namespace: default
 `, content)

plugin/builtin/namespacetransformer/NamespaceTransformer.go

@@ -11,13 +11,14 @@ import (
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers"
+	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config"
 	"sigs.k8s.io/yaml"
 )
 
 // Change or set the namespace of non-cluster level resources.
 type plugin struct {
-	Namespace  string             `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	FieldSpecs []config.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"`
 }
 

plugin/builtin/secretgenerator/SecretGenerator.go

@@ -14,6 +14,7 @@ import (
 type plugin struct {
 	ldr              ifc.Loader
 	rf               *resmap.Factory
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	types.GeneratorOptions
 	types.SecretArgs
 }
@@ -26,6 +27,12 @@ func (p *plugin) Config(
 	p.GeneratorOptions = types.GeneratorOptions{}
 	p.SecretArgs = types.SecretArgs{}
 	err = yaml.Unmarshal(config, p)
+	if p.SecretArgs.Name == "" {
+		p.SecretArgs.Name = p.Name
+	}
+	if p.SecretArgs.Namespace == "" {
+		p.SecretArgs.Namespace = p.Namespace
+	}
 	p.ldr = ldr
 	p.rf = rf
 	return

plugin/builtin/secretgenerator/SecretGenerator_test.go

@@ -34,7 +34,6 @@ consectetur adipiscing elit.
 apiVersion: builtin
 kind: SecretGenerator
 metadata:
-  name: exampleSecGen
   name: mySecret
   namespace: whatever
 behavior: merge

plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go

@@ -15,8 +15,7 @@ import (
 type plugin struct {
 	rf               *resmap.Factory
 	ldr              ifc.Loader
-	Name      string `json:"name,omitempty" yaml:"name,omitempty"`
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	// List of keys to use in database lookups
 	Keys []string `json:"keys,omitempty" yaml:"keys,omitempty"`
 }

plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go

@@ -23,7 +23,6 @@ func TestSecretsFromDatabasePlugin(t *testing.T) {
 apiVersion: someteam.example.com/v1
 kind: SecretsFromDatabase
 metadata:
-  name: mySecretGenerator
   name: forbiddenValues
   namespace: production
 keys:

plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go

@@ -9,13 +9,14 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/yaml"
 )
 
 // A simple generator example.  Makes one service.
 type plugin struct {
 	rf               *resmap.Factory
-	Name string `json:"name,omitempty" yaml:"name,omitempty"`
+	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	Port             string `json:"port,omitempty" yaml:"port,omitempty"`
 }
 
@@ -30,6 +31,7 @@ metadata:
   labels:
     app: dev
   name: {{.Name}}
+  namespace: {{.Namespace}}
 spec:
   ports:
   - port: {{.Port}}

plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go

@@ -23,8 +23,8 @@ func TestSomeServiceGeneratorPlugin(t *testing.T) {
 apiVersion: someteam.example.com/v1
 kind: SomeServiceGenerator
 metadata:
-  name: myGenerator
   name: my-service
+  namespace: test
 port: "12345"
 `)
 	th.AssertActualEqualsExpected(m, `
@@ -34,6 +34,7 @@ metadata:
   labels:
     app: dev
   name: my-service
+  namespace: test
 spec:
   ports:
   - port: 12345