Merge pull request kubernetes-sigs#4973 from KnVerey/remove-inventory…

…-field Remove long-ignored Inventory field from Kustomization type
KnVerey · Jan 20, 2023 · 89d3ca1 · 89d3ca1
2 parents d858ed8 + d70315f
commit 89d3ca1
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 26 deletions.
diff --git a/api/krusty/options.go b/api/krusty/options.go
@@ -43,9 +43,6 @@ type Options struct {
 	// See type definition.
 	LoadRestrictions types.LoadRestrictions
 
-	// Create an inventory object for pruning.
-	DoPrune bool
-
 	// Options related to kustomize plugins.
 	PluginConfig *types.PluginConfig
 }
@@ -56,7 +53,6 @@ func MakeDefaultOptions() *Options {
 		Reorder:           ReorderOptionNone,
 		AddManagedbyLabel: false,
 		LoadRestrictions:  types.LoadRestrictionsRootOnly,
-		DoPrune:           false,
 		PluginConfig:      types.DisabledPluginConfig(),
 	}
 }

diff --git a/api/types/inventory.go b/api/types/inventory.go
diff --git a/api/types/kustomization.go b/api/types/kustomization.go
@@ -171,10 +171,6 @@ type Kustomization struct {
 	// Validators is a list of files containing validators
 	Validators []string `json:"validators,omitempty" yaml:"validators,omitempty"`
 
-	// Inventory appends an object that contains the record
-	// of all other objects, which can be used in apply, prune and delete
-	Inventory *Inventory `json:"inventory,omitempty" yaml:"inventory,omitempty"`
-
 	// BuildMetadata is a list of strings used to toggle different build options
 	BuildMetadata []string `json:"buildMetadata,omitempty" yaml:"buildMetadata,omitempty"`
 }

diff --git a/kustomize/commands/internal/kustfile/kustomizationfile.go b/kustomize/commands/internal/kustfile/kustomizationfile.go
@@ -65,7 +65,6 @@ func determineFieldOrder() []string {
 		"Configurations",
 		"Generators",
 		"Transformers",
-		"Inventory",
 		"Components",
 		"OpenAPI",
 		"BuildMetadata",

diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go
@@ -46,7 +46,6 @@ func TestFieldOrder(t *testing.T) {
 		"Configurations",
 		"Generators",
 		"Transformers",
-		"Inventory",
 		"Components",
 		"OpenAPI",
 		"BuildMetadata",