fix(agent): fix cnr residue when node deletion

Author: chenxi-seu

cmd/katalyst-agent/app/options/reporter/reporter_base.go

@@ -36,6 +36,7 @@ type GenericReporterOptions struct {
 	CollectInterval        time.Duration
 	InnerPlugins           []string
 	RefreshLatestCNRPeriod time.Duration
+	DefaultCNRLabels       map[string]string
 }
 
 // NewGenericReporterOptions creates a new Options with a default config.
@@ -44,6 +45,7 @@ func NewGenericReporterOptions() *GenericReporterOptions {
 		InnerPlugins:           []string{"*"},
 		CollectInterval:        defaultCollectInterval,
 		RefreshLatestCNRPeriod: defaultRefreshLatestCNRPeriod,
+		DefaultCNRLabels:       make(map[string]string),
 	}
 }
 
@@ -59,13 +61,16 @@ func (o *GenericReporterOptions) AddFlags(fss *cliflag.NamedFlagSets) {
 	fs.StringSliceVar(&o.InnerPlugins, "reporter-plugins", o.InnerPlugins, fmt.Sprintf(""+
 		"A list of reporter plugins to enable. '*' enables all on-by-default reporter plugins, 'foo' enables the reporter plugin "+
 		"named 'foo', '-foo' disables the reporter plugin named 'foo'"))
+	fs.StringToStringVar(&o.DefaultCNRLabels, "default-cnr-labels", o.DefaultCNRLabels,
+		"the default labels of cnr created by agent, this config must be consistent with the label-selector in katalyst-controller.")
 }
 
 // ApplyTo fills up config with options
 func (o *GenericReporterOptions) ApplyTo(c *reporterconfig.GenericReporterConfiguration) error {
 	c.CollectInterval = o.CollectInterval
 	c.InnerPlugins = o.InnerPlugins
 	c.RefreshLatestCNRPeriod = o.RefreshLatestCNRPeriod
+	c.DefaultCNRLabels = o.DefaultCNRLabels
 	return nil
 }
 

pkg/agent/resourcemanager/reporter/cnr/cnrreporter.go

@@ -61,6 +61,8 @@ const (
 type cnrReporterImpl struct {
 	cnrName string
 
+	// defaultLabels contains the default config for CNR created by reporter
+	defaultLabels map[string]string
 	// latestUpdatedCNR is used as an in-memory cache for CNR;
 	// whenever CNR info is needed, get from this cache firstly
 	latestUpdatedCNR *nodev1alpha1.CustomNodeResource
@@ -83,6 +85,7 @@ func NewCNRReporter(genericClient *client.GenericClientSet, metaServer *metaserv
 	c := &cnrReporterImpl{
 		cnrName:                conf.NodeName,
 		refreshLatestCNRPeriod: conf.RefreshLatestCNRPeriod,
+		defaultLabels:          conf.DefaultCNRLabels,
 		notifiers:              make(map[string]metaservercnr.CNRNotifier),
 		emitter:                emitter,
 		client:                 genericClient.InternalClient,
@@ -337,7 +340,8 @@ func (c *cnrReporterImpl) resetCNRIfNeeded(err error) bool {
 func (c *cnrReporterImpl) defaultCNR() *nodev1alpha1.CustomNodeResource {
 	return &nodev1alpha1.CustomNodeResource{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: c.cnrName,
+			Name:   c.cnrName,
+			Labels: c.defaultLabels,
 		},
 	}
 }

pkg/config/agent/reporter/reporter_base.go

@@ -31,6 +31,9 @@ type GenericReporterConfiguration struct {
 	InnerPlugins []string
 
 	RefreshLatestCNRPeriod time.Duration
+
+	// DefaultCNRLabels is the labels for CNR created by reporter
+	DefaultCNRLabels map[string]string
 }
 
 type ReporterPluginsConfiguration struct {

pkg/controller/lifecycle/cnr.go

@@ -320,7 +320,7 @@ func (cl *CNRLifecycle) updateOrCreateCNR(node *corev1.Node) error {
 	}
 
 	newCNR := cnr.DeepCopy()
-	newCNR.Labels = node.Labels
+	newCNR.Labels = general.MergeMap(newCNR.Labels, node.Labels)
 	setCNROwnerReference(newCNR, node)
 	if apiequality.Semantic.DeepEqual(newCNR, cnr) {
 		return nil