apf: clarify with comment

tkashem · tkashem · commit df41fe5d84ef · 2022-01-19T17:38:31.000-05:00
diff --git a/pkg/registry/flowcontrol/ensurer/flowschema.go b/pkg/registry/flowcontrol/ensurer/flowschema.go
@@ -41,9 +41,14 @@ type FlowSchemaEnsurer interface {
 	Ensure([]*flowcontrolv1beta2.FlowSchema) error
 }
 
-// FlowSchemaRemover removes the specified bootstrap configuration objects
+// FlowSchemaRemover is the interface that wraps the
+// RemoveAutoUpdateEnabledObjects method.
+//
+// RemoveAutoUpdateEnabledObjects removes a set of bootstrap FlowSchema
+// objects specified via their names. The function removes an object
+// only if automatic update of the spec is enabled for it.
 type FlowSchemaRemover interface {
-	Remove([]string) error
+	RemoveAutoUpdateEnabledObjects([]string) error
 }
 
 // NewSuggestedFlowSchemaEnsurer returns a FlowSchemaEnsurer instance that
@@ -83,11 +88,11 @@ func NewFlowSchemaRemover(client flowcontrolclient.FlowSchemaInterface, lister f
 	}
 }
 
-// GetFlowSchemaRemoveCandidate returns a list of FlowSchema object
+// GetFlowSchemaRemoveCandidates returns a list of FlowSchema object
 // names that are candidates for deletion from the cluster.
 // bootstrap: a set of hard coded FlowSchema configuration objects
 // kube-apiserver maintains in-memory.
-func GetFlowSchemaRemoveCandidate(lister flowcontrollisters.FlowSchemaLister, bootstrap []*flowcontrolv1beta2.FlowSchema) ([]string, error) {
+func GetFlowSchemaRemoveCandidates(lister flowcontrollisters.FlowSchemaLister, bootstrap []*flowcontrolv1beta2.FlowSchema) ([]string, error) {
 	fsList, err := lister.List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("failed to list FlowSchema - %w", err)
@@ -103,7 +108,7 @@ func GetFlowSchemaRemoveCandidate(lister flowcontrollisters.FlowSchemaLister, bo
 		currentObjects[i] = fsList[i]
 	}
 
-	return getRemoveCandidate(bootstrapNames, currentObjects), nil
+	return getDanglingBootstrapObjectNames(bootstrapNames, currentObjects), nil
 }
 
 type fsEnsurer struct {
@@ -121,9 +126,9 @@ func (e *fsEnsurer) Ensure(flowSchemas []*flowcontrolv1beta2.FlowSchema) error {
 	return nil
 }
 
-func (e *fsEnsurer) Remove(flowSchemas []string) error {
+func (e *fsEnsurer) RemoveAutoUpdateEnabledObjects(flowSchemas []string) error {
 	for _, flowSchema := range flowSchemas {
-		if err := removeConfiguration(e.wrapper, flowSchema); err != nil {
+		if err := removeAutoUpdateEnabledConfiguration(e.wrapper, flowSchema); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/registry/flowcontrol/ensurer/flowschema_test.go b/pkg/registry/flowcontrol/ensurer/flowschema_test.go
@@ -322,7 +322,7 @@ func TestRemoveFlowSchema(t *testing.T) {
 			}
 
 			remover := NewFlowSchemaRemover(client, flowcontrollisters.NewFlowSchemaLister(indexer))
-			err := remover.Remove([]string{test.bootstrapName})
+			err := remover.RemoveAutoUpdateEnabledObjects([]string{test.bootstrapName})
 			if err != nil {
 				t.Fatalf("Expected no error, but got: %v", err)
 			}
@@ -410,7 +410,7 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) {
 			}
 
 			lister := flowcontrollisters.NewFlowSchemaLister(indexer)
-			removeListGot, err := GetFlowSchemaRemoveCandidate(lister, test.bootstrap)
+			removeListGot, err := GetFlowSchemaRemoveCandidates(lister, test.bootstrap)
 			if err != nil {
 				t.Fatalf("Expected no error, but got: %v", err)
 			}
diff --git a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration.go
@@ -41,9 +41,15 @@ type PriorityLevelEnsurer interface {
 	Ensure([]*flowcontrolv1beta2.PriorityLevelConfiguration) error
 }
 
-// PriorityLevelRemover removes the specified bootstrap configuration objects
+// PriorityLevelRemover is the interface that wraps the
+// RemoveAutoUpdateEnabledObjects method.
+//
+// RemoveAutoUpdateEnabledObjects removes a set of bootstrap
+// PriorityLevelConfiguration objects specified via their names.
+// The function removes an object only if automatic update
+// of the spec is enabled for it.
 type PriorityLevelRemover interface {
-	Remove([]string) error
+	RemoveAutoUpdateEnabledObjects([]string) error
 }
 
 // NewSuggestedPriorityLevelEnsurerEnsurer returns a PriorityLevelEnsurer instance that
@@ -83,11 +89,11 @@ func NewPriorityLevelRemover(client flowcontrolclient.PriorityLevelConfiguration
 	}
 }
 
-// GetPriorityLevelRemoveCandidate returns a list of PriorityLevelConfiguration
+// GetPriorityLevelRemoveCandidates returns a list of PriorityLevelConfiguration
 // names that are candidates for removal from the cluster.
 // bootstrap: a set of hard coded PriorityLevelConfiguration configuration
 // objects kube-apiserver maintains in-memory.
-func GetPriorityLevelRemoveCandidate(lister flowcontrollisters.PriorityLevelConfigurationLister, bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration) ([]string, error) {
+func GetPriorityLevelRemoveCandidates(lister flowcontrollisters.PriorityLevelConfigurationLister, bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration) ([]string, error) {
 	plList, err := lister.List(labels.Everything())
 	if err != nil {
 		return nil, fmt.Errorf("failed to list PriorityLevelConfiguration - %w", err)
@@ -103,7 +109,7 @@ func GetPriorityLevelRemoveCandidate(lister flowcontrollisters.PriorityLevelConf
 		currentObjects[i] = plList[i]
 	}
 
-	return getRemoveCandidate(bootstrapNames, currentObjects), nil
+	return getDanglingBootstrapObjectNames(bootstrapNames, currentObjects), nil
 }
 
 type plEnsurer struct {
@@ -121,9 +127,9 @@ func (e *plEnsurer) Ensure(priorityLevels []*flowcontrolv1beta2.PriorityLevelCon
 	return nil
 }
 
-func (e *plEnsurer) Remove(priorityLevels []string) error {
+func (e *plEnsurer) RemoveAutoUpdateEnabledObjects(priorityLevels []string) error {
 	for _, priorityLevel := range priorityLevels {
-		if err := removeConfiguration(e.wrapper, priorityLevel); err != nil {
+		if err := removeAutoUpdateEnabledConfiguration(e.wrapper, priorityLevel); err != nil {
 			return err
 		}
 	}
diff --git a/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go b/pkg/registry/flowcontrol/ensurer/prioritylevelconfiguration_test.go
@@ -338,7 +338,7 @@ func TestRemovePriorityLevelConfiguration(t *testing.T) {
 			}
 
 			remover := NewPriorityLevelRemover(client, flowcontrollisters.NewPriorityLevelConfigurationLister(indexer))
-			err := remover.Remove([]string{test.bootstrapName})
+			err := remover.RemoveAutoUpdateEnabledObjects([]string{test.bootstrapName})
 			if err != nil {
 				t.Fatalf("Expected no error, but got: %v", err)
 			}
@@ -426,7 +426,7 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) {
 			}
 
 			lister := flowcontrollisters.NewPriorityLevelConfigurationLister(indexer)
-			removeListGot, err := GetPriorityLevelRemoveCandidate(lister, test.bootstrap)
+			removeListGot, err := GetPriorityLevelRemoveCandidates(lister, test.bootstrap)
 			if err != nil {
 				t.Fatalf("Expected no error, but got: %v", err)
 			}
diff --git a/pkg/registry/flowcontrol/ensurer/strategy.go b/pkg/registry/flowcontrol/ensurer/strategy.go
@@ -268,7 +268,9 @@ func ensureConfiguration(wrapper configurationWrapper, strategy ensureStrategy,
 	return fmt.Errorf("failed to update the %s, will retry later type=%s name=%q error=%w", wrapper.TypeName(), configurationType, name, err)
 }
 
-func removeConfiguration(wrapper configurationWrapper, name string) error {
+// removeAutoUpdateEnabledConfiguration makes an attempt to remove the given
+// configuration object if automatic update of the spec is enabled for this object.
+func removeAutoUpdateEnabledConfiguration(wrapper configurationWrapper, name string) error {
 	current, err := wrapper.Get(name)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
@@ -305,16 +307,17 @@ func removeConfiguration(wrapper configurationWrapper, name string) error {
 	return nil
 }
 
-// getRemoveCandidate returns a list of configuration objects we should delete
-// from the cluster given a set of bootstrap and current configuration.
-// bootstrap: a set of hard coded configuration kube-apiserver maintains in-memory.
-// current: a set of configuration objects that exist on the cluster
-// Any object present in current is a candidate for removal if both a and b are true:
+// getDanglingBootstrapObjectNames returns a list of names of bootstrap
+// configuration objects that are potentially candidates for deletion from
+// the cluster, given a set of bootstrap and current configuration.
+//  - bootstrap: a set of hard coded configuration kube-apiserver maintains in-memory.
+//  - current: a set of configuration objects that exist on the cluster
+// Any object present in current is added to the list if both a and b are true:
 //  a. the object in current is missing from the bootstrap configuration
 //  b. the object has the designated auto-update annotation key
-// This function shares the common logic for both FlowSchema and PriorityLevelConfiguration
-// type and hence it accepts metav1.Object only.
-func getRemoveCandidate(bootstrap sets.String, current []metav1.Object) []string {
+// This function shares the common logic for both FlowSchema and
+// PriorityLevelConfiguration type and hence it accepts metav1.Object only.
+func getDanglingBootstrapObjectNames(bootstrap sets.String, current []metav1.Object) []string {
 	if len(current) == 0 {
 		return nil
 	}
@@ -323,7 +326,9 @@ func getRemoveCandidate(bootstrap sets.String, current []metav1.Object) []string
 	for i := range current {
 		object := current[i]
 		if _, ok := object.GetAnnotations()[flowcontrolv1beta2.AutoUpdateAnnotationKey]; !ok {
-			// the configuration object does not have the annotation key
+			// the configuration object does not have the annotation key,
+			// it's probably a user defined configuration object,
+			// so we can skip it.
 			continue
 		}
 
diff --git a/pkg/registry/flowcontrol/rest/storage_flowcontrol.go b/pkg/registry/flowcontrol/rest/storage_flowcontrol.go
@@ -188,7 +188,7 @@ func ensure(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister fl
 		return fmt.Errorf("failed ensuring mandatory settings - %w", err)
 	}
 
-	if err := removeConfiguration(clientset, fsLister, plcLister); err != nil {
+	if err := removeDanglingBootstrapConfiguration(clientset, fsLister, plcLister); err != nil {
 		return fmt.Errorf("failed to delete removed settings - %w", err)
 	}
 
@@ -215,17 +215,17 @@ func ensureMandatoryConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2
 	return plEnsurer.Ensure(flowcontrolbootstrap.MandatoryPriorityLevelConfigurations)
 }
 
-func removeConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister flowcontrollisters.FlowSchemaLister, plcLister flowcontrollisters.PriorityLevelConfigurationLister) error {
-	if err := removeFlowSchema(clientset.FlowSchemas(), fsLister); err != nil {
+func removeDanglingBootstrapConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister flowcontrollisters.FlowSchemaLister, plcLister flowcontrollisters.PriorityLevelConfigurationLister) error {
+	if err := removeDanglingBootstrapFlowSchema(clientset.FlowSchemas(), fsLister); err != nil {
 		return err
 	}
 
-	return removePriorityLevel(clientset.PriorityLevelConfigurations(), plcLister)
+	return removeDanglingBootstrapPriorityLevel(clientset.PriorityLevelConfigurations(), plcLister)
 }
 
-func removeFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowcontrollisters.FlowSchemaLister) error {
+func removeDanglingBootstrapFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowcontrollisters.FlowSchemaLister) error {
 	bootstrap := append(flowcontrolbootstrap.MandatoryFlowSchemas, flowcontrolbootstrap.SuggestedFlowSchemas...)
-	candidates, err := ensurer.GetFlowSchemaRemoveCandidate(lister, bootstrap)
+	candidates, err := ensurer.GetFlowSchemaRemoveCandidates(lister, bootstrap)
 	if err != nil {
 		return err
 	}
@@ -234,12 +234,12 @@ func removeFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowc
 	}
 
 	fsRemover := ensurer.NewFlowSchemaRemover(client, lister)
-	return fsRemover.Remove(candidates)
+	return fsRemover.RemoveAutoUpdateEnabledObjects(candidates)
 }
 
-func removePriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInterface, lister flowcontrollisters.PriorityLevelConfigurationLister) error {
+func removeDanglingBootstrapPriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInterface, lister flowcontrollisters.PriorityLevelConfigurationLister) error {
 	bootstrap := append(flowcontrolbootstrap.MandatoryPriorityLevelConfigurations, flowcontrolbootstrap.SuggestedPriorityLevelConfigurations...)
-	candidates, err := ensurer.GetPriorityLevelRemoveCandidate(lister, bootstrap)
+	candidates, err := ensurer.GetPriorityLevelRemoveCandidates(lister, bootstrap)
 	if err != nil {
 		return err
 	}
@@ -248,7 +248,7 @@ func removePriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInte
 	}
 
 	plRemover := ensurer.NewPriorityLevelRemover(client, lister)
-	return plRemover.Remove(candidates)
+	return plRemover.RemoveAutoUpdateEnabledObjects(candidates)
 }
 
 // contextFromChannelAndMaxWaitDuration returns a Context that is bound to the

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,14 @@ type FlowSchemaEnsurer interface {`
`41`	`41`	`Ensure([]*flowcontrolv1beta2.FlowSchema) error`
`42`	`42`	`}`
`43`	`43`
`44`		`-// FlowSchemaRemover removes the specified bootstrap configuration objects`
	`44`	`+// FlowSchemaRemover is the interface that wraps the`
	`45`	`+// RemoveAutoUpdateEnabledObjects method.`
	`46`	`+//`
	`47`	`+// RemoveAutoUpdateEnabledObjects removes a set of bootstrap FlowSchema`
	`48`	`+// objects specified via their names. The function removes an object`
	`49`	`+// only if automatic update of the spec is enabled for it.`
`45`	`50`	`type FlowSchemaRemover interface {`
`46`		`- Remove([]string) error`
	`51`	`+ RemoveAutoUpdateEnabledObjects([]string) error`
`47`	`52`	`}`
`48`	`53`
`49`	`54`	`// NewSuggestedFlowSchemaEnsurer returns a FlowSchemaEnsurer instance that`
`@@ -83,11 +88,11 @@ func NewFlowSchemaRemover(client flowcontrolclient.FlowSchemaInterface, lister f`
`83`	`88`	`}`
`84`	`89`	`}`
`85`	`90`
`86`		`-// GetFlowSchemaRemoveCandidate returns a list of FlowSchema object`
	`91`	`+// GetFlowSchemaRemoveCandidates returns a list of FlowSchema object`
`87`	`92`	`// names that are candidates for deletion from the cluster.`
`88`	`93`	`// bootstrap: a set of hard coded FlowSchema configuration objects`
`89`	`94`	`// kube-apiserver maintains in-memory.`
`90`		`-func GetFlowSchemaRemoveCandidate(lister flowcontrollisters.FlowSchemaLister, bootstrap []*flowcontrolv1beta2.FlowSchema) ([]string, error) {`
	`95`	`+func GetFlowSchemaRemoveCandidates(lister flowcontrollisters.FlowSchemaLister, bootstrap []*flowcontrolv1beta2.FlowSchema) ([]string, error) {`
`91`	`96`	`fsList, err := lister.List(labels.Everything())`
`92`	`97`	`if err != nil {`
`93`	`98`	`return nil, fmt.Errorf("failed to list FlowSchema - %w", err)`
`@@ -103,7 +108,7 @@ func GetFlowSchemaRemoveCandidate(lister flowcontrollisters.FlowSchemaLister, bo`
`103`	`108`	`currentObjects[i] = fsList[i]`
`104`	`109`	`}`
`105`	`110`
`106`		`- return getRemoveCandidate(bootstrapNames, currentObjects), nil`
	`111`	`+ return getDanglingBootstrapObjectNames(bootstrapNames, currentObjects), nil`
`107`	`112`	`}`
`108`	`113`
`109`	`114`	`type fsEnsurer struct {`
`@@ -121,9 +126,9 @@ func (e fsEnsurer) Ensure(flowSchemas []flowcontrolv1beta2.FlowSchema) error {`
`121`	`126`	`return nil`
`122`	`127`	`}`
`123`	`128`
`124`		`-func (e *fsEnsurer) Remove(flowSchemas []string) error {`
	`129`	`+func (e *fsEnsurer) RemoveAutoUpdateEnabledObjects(flowSchemas []string) error {`
`125`	`130`	`for _, flowSchema := range flowSchemas {`
`126`		`- if err := removeConfiguration(e.wrapper, flowSchema); err != nil {`
	`131`	`+ if err := removeAutoUpdateEnabledConfiguration(e.wrapper, flowSchema); err != nil {`
`127`	`132`	`return err`
`128`	`133`	`}`
`129`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ func TestRemoveFlowSchema(t *testing.T) {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`remover := NewFlowSchemaRemover(client, flowcontrollisters.NewFlowSchemaLister(indexer))`
`325`		`- err := remover.Remove([]string{test.bootstrapName})`
	`325`	`+ err := remover.RemoveAutoUpdateEnabledObjects([]string{test.bootstrapName})`
`326`	`326`	`if err != nil {`
`327`	`327`	`t.Fatalf("Expected no error, but got: %v", err)`
`328`	`328`	`}`
`@@ -410,7 +410,7 @@ func TestGetFlowSchemaRemoveCandidate(t *testing.T) {`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`lister := flowcontrollisters.NewFlowSchemaLister(indexer)`
`413`		`- removeListGot, err := GetFlowSchemaRemoveCandidate(lister, test.bootstrap)`
	`413`	`+ removeListGot, err := GetFlowSchemaRemoveCandidates(lister, test.bootstrap)`
`414`	`414`	`if err != nil {`
`415`	`415`	`t.Fatalf("Expected no error, but got: %v", err)`
`416`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,15 @@ type PriorityLevelEnsurer interface {`
`41`	`41`	`Ensure([]*flowcontrolv1beta2.PriorityLevelConfiguration) error`
`42`	`42`	`}`
`43`	`43`
`44`		`-// PriorityLevelRemover removes the specified bootstrap configuration objects`
	`44`	`+// PriorityLevelRemover is the interface that wraps the`
	`45`	`+// RemoveAutoUpdateEnabledObjects method.`
	`46`	`+//`
	`47`	`+// RemoveAutoUpdateEnabledObjects removes a set of bootstrap`
	`48`	`+// PriorityLevelConfiguration objects specified via their names.`
	`49`	`+// The function removes an object only if automatic update`
	`50`	`+// of the spec is enabled for it.`
`45`	`51`	`type PriorityLevelRemover interface {`
`46`		`- Remove([]string) error`
	`52`	`+ RemoveAutoUpdateEnabledObjects([]string) error`
`47`	`53`	`}`
`48`	`54`
`49`	`55`	`// NewSuggestedPriorityLevelEnsurerEnsurer returns a PriorityLevelEnsurer instance that`
`@@ -83,11 +89,11 @@ func NewPriorityLevelRemover(client flowcontrolclient.PriorityLevelConfiguration`
`83`	`89`	`}`
`84`	`90`	`}`
`85`	`91`
`86`		`-// GetPriorityLevelRemoveCandidate returns a list of PriorityLevelConfiguration`
	`92`	`+// GetPriorityLevelRemoveCandidates returns a list of PriorityLevelConfiguration`
`87`	`93`	`// names that are candidates for removal from the cluster.`
`88`	`94`	`// bootstrap: a set of hard coded PriorityLevelConfiguration configuration`
`89`	`95`	`// objects kube-apiserver maintains in-memory.`
`90`		`-func GetPriorityLevelRemoveCandidate(lister flowcontrollisters.PriorityLevelConfigurationLister, bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration) ([]string, error) {`
	`96`	`+func GetPriorityLevelRemoveCandidates(lister flowcontrollisters.PriorityLevelConfigurationLister, bootstrap []*flowcontrolv1beta2.PriorityLevelConfiguration) ([]string, error) {`
`91`	`97`	`plList, err := lister.List(labels.Everything())`
`92`	`98`	`if err != nil {`
`93`	`99`	`return nil, fmt.Errorf("failed to list PriorityLevelConfiguration - %w", err)`
`@@ -103,7 +109,7 @@ func GetPriorityLevelRemoveCandidate(lister flowcontrollisters.PriorityLevelConf`
`103`	`109`	`currentObjects[i] = plList[i]`
`104`	`110`	`}`
`105`	`111`
`106`		`- return getRemoveCandidate(bootstrapNames, currentObjects), nil`
	`112`	`+ return getDanglingBootstrapObjectNames(bootstrapNames, currentObjects), nil`
`107`	`113`	`}`
`108`	`114`
`109`	`115`	`type plEnsurer struct {`
`@@ -121,9 +127,9 @@ func (e plEnsurer) Ensure(priorityLevels []flowcontrolv1beta2.PriorityLevelCon`
`121`	`127`	`return nil`
`122`	`128`	`}`
`123`	`129`
`124`		`-func (e *plEnsurer) Remove(priorityLevels []string) error {`
	`130`	`+func (e *plEnsurer) RemoveAutoUpdateEnabledObjects(priorityLevels []string) error {`
`125`	`131`	`for _, priorityLevel := range priorityLevels {`
`126`		`- if err := removeConfiguration(e.wrapper, priorityLevel); err != nil {`
	`132`	`+ if err := removeAutoUpdateEnabledConfiguration(e.wrapper, priorityLevel); err != nil {`
`127`	`133`	`return err`
`128`	`134`	`}`
`129`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ func TestRemovePriorityLevelConfiguration(t *testing.T) {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`remover := NewPriorityLevelRemover(client, flowcontrollisters.NewPriorityLevelConfigurationLister(indexer))`
`341`		`- err := remover.Remove([]string{test.bootstrapName})`
	`341`	`+ err := remover.RemoveAutoUpdateEnabledObjects([]string{test.bootstrapName})`
`342`	`342`	`if err != nil {`
`343`	`343`	`t.Fatalf("Expected no error, but got: %v", err)`
`344`	`344`	`}`
`@@ -426,7 +426,7 @@ func TestGetPriorityLevelRemoveCandidate(t *testing.T) {`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`lister := flowcontrollisters.NewPriorityLevelConfigurationLister(indexer)`
`429`		`- removeListGot, err := GetPriorityLevelRemoveCandidate(lister, test.bootstrap)`
	`429`	`+ removeListGot, err := GetPriorityLevelRemoveCandidates(lister, test.bootstrap)`
`430`	`430`	`if err != nil {`
`431`	`431`	`t.Fatalf("Expected no error, but got: %v", err)`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func ensure(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister fl`
`188`	`188`	`return fmt.Errorf("failed ensuring mandatory settings - %w", err)`
`189`	`189`	`}`
`190`	`190`
`191`		`- if err := removeConfiguration(clientset, fsLister, plcLister); err != nil {`
	`191`	`+ if err := removeDanglingBootstrapConfiguration(clientset, fsLister, plcLister); err != nil {`
`192`	`192`	`return fmt.Errorf("failed to delete removed settings - %w", err)`
`193`	`193`	`}`
`194`	`194`
`@@ -215,17 +215,17 @@ func ensureMandatoryConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2`
`215`	`215`	`return plEnsurer.Ensure(flowcontrolbootstrap.MandatoryPriorityLevelConfigurations)`
`216`	`216`	`}`
`217`	`217`
`218`		`-func removeConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister flowcontrollisters.FlowSchemaLister, plcLister flowcontrollisters.PriorityLevelConfigurationLister) error {`
`219`		`- if err := removeFlowSchema(clientset.FlowSchemas(), fsLister); err != nil {`
	`218`	`+func removeDanglingBootstrapConfiguration(clientset flowcontrolclient.FlowcontrolV1beta2Interface, fsLister flowcontrollisters.FlowSchemaLister, plcLister flowcontrollisters.PriorityLevelConfigurationLister) error {`
	`219`	`+ if err := removeDanglingBootstrapFlowSchema(clientset.FlowSchemas(), fsLister); err != nil {`
`220`	`220`	`return err`
`221`	`221`	`}`
`222`	`222`
`223`		`- return removePriorityLevel(clientset.PriorityLevelConfigurations(), plcLister)`
	`223`	`+ return removeDanglingBootstrapPriorityLevel(clientset.PriorityLevelConfigurations(), plcLister)`
`224`	`224`	`}`
`225`	`225`
`226`		`-func removeFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowcontrollisters.FlowSchemaLister) error {`
	`226`	`+func removeDanglingBootstrapFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowcontrollisters.FlowSchemaLister) error {`
`227`	`227`	`bootstrap := append(flowcontrolbootstrap.MandatoryFlowSchemas, flowcontrolbootstrap.SuggestedFlowSchemas...)`
`228`		`- candidates, err := ensurer.GetFlowSchemaRemoveCandidate(lister, bootstrap)`
	`228`	`+ candidates, err := ensurer.GetFlowSchemaRemoveCandidates(lister, bootstrap)`
`229`	`229`	`if err != nil {`
`230`	`230`	`return err`
`231`	`231`	`}`
`@@ -234,12 +234,12 @@ func removeFlowSchema(client flowcontrolclient.FlowSchemaInterface, lister flowc`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`fsRemover := ensurer.NewFlowSchemaRemover(client, lister)`
`237`		`- return fsRemover.Remove(candidates)`
	`237`	`+ return fsRemover.RemoveAutoUpdateEnabledObjects(candidates)`
`238`	`238`	`}`
`239`	`239`
`240`		`-func removePriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInterface, lister flowcontrollisters.PriorityLevelConfigurationLister) error {`
	`240`	`+func removeDanglingBootstrapPriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInterface, lister flowcontrollisters.PriorityLevelConfigurationLister) error {`
`241`	`241`	`bootstrap := append(flowcontrolbootstrap.MandatoryPriorityLevelConfigurations, flowcontrolbootstrap.SuggestedPriorityLevelConfigurations...)`
`242`		`- candidates, err := ensurer.GetPriorityLevelRemoveCandidate(lister, bootstrap)`
	`242`	`+ candidates, err := ensurer.GetPriorityLevelRemoveCandidates(lister, bootstrap)`
`243`	`243`	`if err != nil {`
`244`	`244`	`return err`
`245`	`245`	`}`
`@@ -248,7 +248,7 @@ func removePriorityLevel(client flowcontrolclient.PriorityLevelConfigurationInte`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`plRemover := ensurer.NewPriorityLevelRemover(client, lister)`
`251`		`- return plRemover.Remove(candidates)`
	`251`	`+ return plRemover.RemoveAutoUpdateEnabledObjects(candidates)`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`// contextFromChannelAndMaxWaitDuration returns a Context that is bound to the`