Merge pull request #2421 from Shell32-Natsu/2392-codeClean

Remove inventory transformer

api/internal/plugins/builtinhelpers/builtinplugintype_string.go

@@ -13,21 +13,20 @@ func _() {
 	_ = x[ConfigMapGenerator-2]
 	_ = x[HashTransformer-3]
 	_ = x[ImageTagTransformer-4]
-	_ = x[InventoryTransformer-5]
-	_ = x[LabelTransformer-6]
-	_ = x[LegacyOrderTransformer-7]
-	_ = x[NamespaceTransformer-8]
-	_ = x[PatchJson6902Transformer-9]
-	_ = x[PatchStrategicMergeTransformer-10]
-	_ = x[PatchTransformer-11]
-	_ = x[PrefixSuffixTransformer-12]
-	_ = x[ReplicaCountTransformer-13]
-	_ = x[SecretGenerator-14]
+	_ = x[LabelTransformer-5]
+	_ = x[LegacyOrderTransformer-6]
+	_ = x[NamespaceTransformer-7]
+	_ = x[PatchJson6902Transformer-8]
+	_ = x[PatchStrategicMergeTransformer-9]
+	_ = x[PatchTransformer-10]
+	_ = x[PrefixSuffixTransformer-11]
+	_ = x[ReplicaCountTransformer-12]
+	_ = x[SecretGenerator-13]
 }
 
-const _BuiltinPluginType_name = "UnknownAnnotationsTransformerConfigMapGeneratorHashTransformerImageTagTransformerInventoryTransformerLabelTransformerLegacyOrderTransformerNamespaceTransformerPatchJson6902TransformerPatchStrategicMergeTransformerPatchTransformerPrefixSuffixTransformerReplicaCountTransformerSecretGenerator"
+const _BuiltinPluginType_name = "UnknownAnnotationsTransformerConfigMapGeneratorHashTransformerImageTagTransformerLabelTransformerLegacyOrderTransformerNamespaceTransformerPatchJson6902TransformerPatchStrategicMergeTransformerPatchTransformerPrefixSuffixTransformerReplicaCountTransformerSecretGenerator"
 
-var _BuiltinPluginType_index = [...]uint16{0, 7, 29, 47, 62, 81, 101, 117, 139, 159, 183, 213, 229, 252, 275, 290}
+var _BuiltinPluginType_index = [...]uint16{0, 7, 29, 47, 62, 81, 97, 119, 139, 163, 193, 209, 232, 255, 270}
 
 func (i BuiltinPluginType) String() string {
 	if i < 0 || i >= BuiltinPluginType(len(_BuiltinPluginType_index)-1) {

api/internal/plugins/builtinhelpers/builtins.go

@@ -17,7 +17,6 @@ const (
 	ConfigMapGenerator
 	HashTransformer
 	ImageTagTransformer
-	InventoryTransformer
 	LabelTransformer
 	LegacyOrderTransformer
 	NamespaceTransformer
@@ -63,7 +62,6 @@ var TransformerFactories = map[BuiltinPluginType]func() resmap.TransformerPlugin
 	AnnotationsTransformer:         builtins.NewAnnotationsTransformerPlugin,
 	HashTransformer:                builtins.NewHashTransformerPlugin,
 	ImageTagTransformer:            builtins.NewImageTagTransformerPlugin,
-	InventoryTransformer:           builtins.NewInventoryTransformerPlugin,
 	LabelTransformer:               builtins.NewLabelTransformerPlugin,
 	LegacyOrderTransformer:         builtins.NewLegacyOrderTransformerPlugin,
 	NamespaceTransformer:           builtins.NewNamespaceTransformerPlugin,

api/internal/target/kusttarget.go

@@ -106,15 +106,10 @@ func unmarshal(y []byte, o interface{}) error {
 // MakeCustomizedResMap creates a fully customized ResMap
 // per the instructions contained in its kustomiztion instance.
 func (kt *KustTarget) MakeCustomizedResMap() (resmap.ResMap, error) {
-	return kt.makeCustomizedResMap(types.GarbageIgnore)
+	return kt.makeCustomizedResMap()
 }
 
-func (kt *KustTarget) MakePruneConfigMap() (resmap.ResMap, error) {
-	return kt.makeCustomizedResMap(types.GarbageCollect)
-}
-
-func (kt *KustTarget) makeCustomizedResMap(
-	garbagePolicy types.GarbagePolicy) (resmap.ResMap, error) {
+func (kt *KustTarget) makeCustomizedResMap() (resmap.ResMap, error) {
 	ra, err := kt.AccumulateTarget()
 	if err != nil {
 		return nil, err
@@ -141,11 +136,6 @@ func (kt *KustTarget) makeCustomizedResMap(
 		return nil, err
 	}
 
-	err = kt.computeInventory(ra, garbagePolicy)
-	if err != nil {
-		return nil, err
-	}
-
 	return ra.ResMap(), nil
 }
 
@@ -159,35 +149,6 @@ func (kt *KustTarget) addHashesToNames(
 	return ra.Transform(p)
 }
 
-func (kt *KustTarget) computeInventory(
-	ra *accumulator.ResAccumulator, garbagePolicy types.GarbagePolicy) error {
-	inv := kt.kustomization.Inventory
-	if inv == nil {
-		return nil
-	}
-	if inv.Type != "ConfigMap" {
-		return fmt.Errorf("don't know how to do that")
-	}
-
-	if inv.ConfigMap.Namespace != kt.kustomization.Namespace {
-		return fmt.Errorf("namespace mismatch")
-	}
-
-	var c struct {
-		Policy           string
-		types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
-	}
-	c.Name = inv.ConfigMap.Name
-	c.Namespace = inv.ConfigMap.Namespace
-	c.Policy = garbagePolicy.String()
-	p := builtins.NewInventoryTransformerPlugin()
-	err := kt.configureBuiltinPlugin(p, c, builtinhelpers.InventoryTransformer)
-	if err != nil {
-		return err
-	}
-	return ra.Transform(p)
-}
-
 // AccumulateTarget returns a new ResAccumulator,
 // holding customized resources and the data/rules used
 // to do so.  The name back references and vars are