Merge pull request #356 from marquiz/devel/sources-flag

nfd-worker: add special handling for --sources=all

cmd/nfd-worker/main.go

@@ -90,8 +90,9 @@ func argsParse(argv []string) (worker.Args, error) {
   --server-name-override=<name> Name (CN) expect from server certificate, useful
                               in testing
                               [Default: ]
-  --sources=<sources>         Comma separated list of feature sources.
+  --sources=<sources>         Comma separated list of feature sources. Special
-                              [Default: cpu,custom,iommu,kernel,local,memory,network,pci,storage,system,usb]
+                              value 'all' enables all feature sources.
+                              [Default: all]
   --no-publish                Do not publish discovered features to the
                               cluster-local Kubernetes API server.
   --label-whitelist=<pattern> Regular expression to filter label names to

cmd/nfd-worker/main_test.go

@@ -23,7 +23,7 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 )
 
-var allSources = []string{"cpu", "custom", "iommu", "kernel", "local", "memory", "network", "pci", "storage", "system", "usb"}
+var allSources = []string{"all"}
 
 func TestArgsParse(t *testing.T) {
 	Convey("When parsing command line arguments", t, func() {

docs/advanced/developer-guide.md

@@ -222,8 +222,6 @@ Command line flags of nfd-worker:
 ```bash
 $ docker run --rm ${NFD_CONTAINER_IMAGE} nfd-worker --help
 ...
-nfd-worker.
-
   Usage:
   nfd-worker [--no-publish] [--sources=<sources>] [--label-whitelist=<pattern>]
      [--oneshot | --sleep-interval=<seconds>] [--config=<path>]
@@ -253,8 +251,9 @@ nfd-worker.
   --server-name-override=<name> Name (CN) expect from server certificate, useful
                               in testing
                               [Default: ]
-  --sources=<sources>         Comma separated list of feature sources.
+  --sources=<sources>         Comma separated list of feature sources. Special
-                              [Default: cpu,custom,iommu,kernel,local,memory,network,pci,storage,system,usb]
+                              value 'all' enables all feature sources.
+                              [Default: all]
   --no-publish                Do not publish discovered features to the
                               cluster-local Kubernetes API server.
   --label-whitelist=<pattern> Regular expression to filter label names to
@@ -266,6 +265,7 @@ nfd-worker.
   --sleep-interval=<seconds>  Time to sleep between re-labeling. Non-positive
                               value implies no re-labeling (i.e. infinite
                               sleep). [Default: 60s]
+
 ```
 
 **NOTE** Some feature sources need certain directories and/or files from the

docs/advanced/worker-commandline-reference.md

@@ -139,9 +139,9 @@ nfd-worker --server-name-override=localhost
 ### --sources
 
 The `--sources` flag specifies a comma-separated list of enabled feature
-sources.
+sources. A special value `all` enables all feature sources.
 
-Default: cpu,custom,iommu,kernel,local,memory,network,pci,storage,system,usb
+Default: all
 
 Example:
 

pkg/nfd-worker/nfd-worker.go

@@ -124,12 +124,10 @@ func NewNfdWorker(args Args) (NfdWorker, error) {
 	// Figure out active sources
 	allSources := []source.FeatureSource{
 		&cpu.Source{},
-		&fake.Source{},
 		&iommu.Source{},
 		&kernel.Source{},
 		&memory.Source{},
 		&network.Source{},
-		&panicfake.Source{},
 		&pci.Source{},
 		&storage.Source{},
 		&system.Source{},
@@ -140,15 +138,33 @@ func NewNfdWorker(args Args) (NfdWorker, error) {
 		&local.Source{},
 	}
 
-	sourceWhiteList := map[string]struct{}{}
+	// Determine enabled feature
-	for _, s := range args.Sources {
+	if len(args.Sources) == 1 && args.Sources[0] == "all" {
-		sourceWhiteList[strings.TrimSpace(s)] = struct{}{}
+		nfd.sources = allSources
-	}
+	} else {
+		// Add fake source which is only meant for testing. It will be enabled
+		// only if listed explicitly.
+		allSources = append(allSources, &fake.Source{})
+		allSources = append(allSources, &panicfake.Source{})
 
-	nfd.sources = []source.FeatureSource{}
+		sourceWhiteList := map[string]struct{}{}
-	for _, s := range allSources {
+		for _, s := range args.Sources {
-		if _, enabled := sourceWhiteList[s.Name()]; enabled {
+			sourceWhiteList[strings.TrimSpace(s)] = struct{}{}
-			nfd.sources = append(nfd.sources, s)
+		}
+
+		nfd.sources = []source.FeatureSource{}
+		for _, s := range allSources {
+			if _, enabled := sourceWhiteList[s.Name()]; enabled {
+				nfd.sources = append(nfd.sources, s)
+				delete(sourceWhiteList, s.Name())
+			}
+		}
+		if len(sourceWhiteList) > 0 {
+			names := make([]string, 0, len(sourceWhiteList))
+			for n := range sourceWhiteList {
+				names = append(names, n)
+			}
+			stderrLogger.Printf("WARNING: skipping unknown source(s) %q specified in --sources", strings.Join(names, ", "))
 		}
 	}