feat: add master resync period configurability

This PR adds a config option for setting the NFD API controller resync period. The resync period is only activated when the NodeFeature API has been enabled (with -enable-nodefeature-api). Signed-off-by: AhmedGrati <ahmedgrati1999@gmail.com>
kubernetes-sigs · Apr 15, 2023 · 17c5e72 · 17c5e72
1 parent 018cd33
commit 17c5e72
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/cmd/nfd-master/main.go b/cmd/nfd-master/main.go
@@ -125,6 +125,9 @@ func initFlags(flagset *flag.FlagSet) (*master.Args, *master.ConfigOverrideArgs)
 	flagset.StringVar(&args.Options, "options", "",
 		"Specify config options from command line. Config options are specified "+
 			"in the same format as in the config file (i.e. json or yaml). These options")
+	flagset.IntVar(&args.ResyncPeriod, "resync-period", 60,
+		"Specify the NFD API controller resync period, expressed in minutes."+
+			"It has an effect when the NodeFeature API has been enabled (with -enable-nodefeature-api).")
 
 	overrides := &master.ConfigOverrideArgs{
 		LabelWhiteList: &utils.RegexpVal{},

diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml
@@ -104,6 +104,9 @@ spec:
             {{- if .Values.master.featureRulesController | kindIs "invalid" | not }}
             - "-featurerules-controller={{ .Values.master.featureRulesController }}"
             {{- end }}
+            {{- if .Values.master.resyncPeriod }}
+            - "-resync-period={{ .Values.master.resyncPeriod }}"
+            {{- end }}
     {{- if .Values.tls.enable }}
             - "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
             - "-key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key"

diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -25,6 +25,7 @@ master:
   port: 8080
   instance:
   featureApi:
+  resyncPeriod:
   denyLabelNs: []
   extraLabelNs: []
   resourceLabels: []

diff --git a/docs/reference/master-commandline-reference.md b/docs/reference/master-commandline-reference.md
@@ -376,3 +376,15 @@ Default: 0
 Comma-separated list of `pattern=N` settings for file-filtered logging.
 
 Default: *empty*
+
+### -resync-period
+
+The `-resync-period` flag specifies the NFD API controller resync period, expressed in minutes.
+
+Default: 60 minutes.
+
+Example:
+
+```bash
+nfd-master -resync-period=50
+```
diff --git a/pkg/nfd-master/nfd-api-controller.go b/pkg/nfd-master/nfd-api-controller.go
@@ -41,19 +41,24 @@ type nfdController struct {
 	updateOneNodeChan  chan string
 }
 
-func newNfdController(config *restclient.Config, disableNodeFeature bool) (*nfdController, error) {
+type NfdApiControllerOptions struct {
+	disableNodeFeature bool
+	resyncPeriod       int
+}
+
+func newNfdController(config *restclient.Config, nfdApiControllerOptions NfdApiControllerOptions) (*nfdController, error) {
 	c := &nfdController{
 		stopChan:           make(chan struct{}, 1),
 		updateAllNodesChan: make(chan struct{}, 1),
 		updateOneNodeChan:  make(chan string),
 	}
 
 	nfdClient := nfdclientset.NewForConfigOrDie(config)
-
-	informerFactory := nfdinformers.NewSharedInformerFactory(nfdClient, 1*time.Hour)
+	resyncDuration := time.Duration(nfdApiControllerOptions.resyncPeriod) * time.Minute
+	informerFactory := nfdinformers.NewSharedInformerFactory(nfdClient, resyncDuration)
 
 	// Add informer for NodeFeature objects
-	if !disableNodeFeature {
+	if !nfdApiControllerOptions.disableNodeFeature {
 		featureInformer := informerFactory.Nfd().V1alpha1().NodeFeatures()
 		if _, err := featureInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
@@ -83,23 +88,23 @@ func newNfdController(config *restclient.Config, disableNodeFeature bool) (*nfdC
 		AddFunc: func(object interface{}) {
 			key, _ := cache.MetaNamespaceKeyFunc(object)
 			klog.V(2).Infof("NodeFeatureRule %v added", key)
-			if !disableNodeFeature {
+			if !nfdApiControllerOptions.disableNodeFeature {
 				c.updateAllNodes()
 			}
 			// else: rules will be processed only when gRPC requests are received
 		},
 		UpdateFunc: func(oldObject, newObject interface{}) {
 			key, _ := cache.MetaNamespaceKeyFunc(newObject)
 			klog.V(2).Infof("NodeFeatureRule %v updated", key)
-			if !disableNodeFeature {
+			if !nfdApiControllerOptions.disableNodeFeature {
 				c.updateAllNodes()
 			}
 			// else: rules will be processed only when gRPC requests are received
 		},
 		DeleteFunc: func(object interface{}) {
 			key, _ := cache.MetaNamespaceKeyFunc(object)
 			klog.V(2).Infof("NodeFeatureRule %v deleted", key)
-			if !disableNodeFeature {
+			if !nfdApiControllerOptions.disableNodeFeature {
 				c.updateAllNodes()
 			}
 			// else: rules will be processed only when gRPC requests are received

diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
@@ -96,6 +96,7 @@ type Args struct {
 	Prune                bool
 	VerifyNodeName       bool
 	Options              string
+	ResyncPeriod         int
 
 	Overrides ConfigOverrideArgs
 }
@@ -195,7 +196,10 @@ func (m *nfdMaster) Run() error {
 			return err
 		}
 		klog.Info("starting nfd api controller")
-		m.nfdController, err = newNfdController(kubeconfig, !m.args.EnableNodeFeatureApi)
+		m.nfdController, err = newNfdController(kubeconfig, NfdApiControllerOptions{
+			disableNodeFeature: !m.args.EnableNodeFeatureApi,
+			resyncPeriod:       m.args.ResyncPeriod,
+		})
 		if err != nil {
 			return fmt.Errorf("failed to initialize CRD controller: %w", err)
 		}