diff --git a/docs/get-started/features.md b/docs/get-started/features.md index a2fd5fdbb..7081dcbaf 100644 --- a/docs/get-started/features.md +++ b/docs/get-started/features.md @@ -429,7 +429,7 @@ labels by defining them in the `nfd-worker` configuration file. | rdma | capable | The node has an RDMA capable Network adapter | | rdma | enabled | The node has the needed RDMA modules loaded to run RDMA traffic | -### IOMMU +### IOMMU (deprecated) The **iommu** feature source supports the following labels: @@ -437,6 +437,8 @@ The **iommu** feature source supports the following labels: | :------------: | :---------------------------------------------------------: | | enabled | IOMMU is present and enabled in the kernel +**DEPRECATED**: The **iommu** source is deprecated and not enabled by default. + ### Kernel The **kernel** feature source supports the following labels: diff --git a/docs/get-started/introduction.md b/docs/get-started/introduction.md index 4219e0082..7522be23c 100644 --- a/docs/get-started/introduction.md +++ b/docs/get-started/introduction.md @@ -52,7 +52,6 @@ supposed to be running on each node of the cluster. Feature discovery is divided into domain-specific feature sources: - CPU -- IOMMU - Kernel - Memory - Network @@ -62,6 +61,7 @@ Feature discovery is divided into domain-specific feature sources: - USB - Custom (rule-based custom features) - Local (hooks for user-specific features) +- IOMMU (*deprecated*) Each feature source is responsible for detecting a set of features which. in turn, are turned into node feature labels. Feature labels are prefixed with @@ -75,7 +75,6 @@ An overview of the default feature labels: { "feature.node.kubernetes.io/cpu-": "true", "feature.node.kubernetes.io/custom-": "true", - "feature.node.kubernetes.io/iommu-": "true", "feature.node.kubernetes.io/kernel-": "", "feature.node.kubernetes.io/memory-": "true", "feature.node.kubernetes.io/network-": "true", diff --git a/pkg/nfd-client/worker/nfd-worker-internal_test.go b/pkg/nfd-client/worker/nfd-worker-internal_test.go index 9b524e4cb..0570e18f2 100644 --- a/pkg/nfd-client/worker/nfd-worker-internal_test.go +++ b/pkg/nfd-client/worker/nfd-worker-internal_test.go @@ -317,7 +317,7 @@ func TestNewNfdWorker(t *testing.T) { So(worker.configure("", ""), ShouldBeNil) Convey("all sources should be enabled and the whitelist regexp should be empty", func() { So(len(worker.featureSources), ShouldEqual, len(source.GetAllFeatureSources())-1) - So(len(worker.labelSources), ShouldEqual, len(source.GetAllLabelSources())-1) + So(len(worker.labelSources), ShouldEqual, len(source.GetAllLabelSources())-2) So(worker.config.Core.LabelWhiteList, ShouldResemble, emptyRegexp) }) }) diff --git a/source/iommu/iommu.go b/source/iommu/iommu.go index d22b8ef0a..fb49f7aa7 100644 --- a/source/iommu/iommu.go +++ b/source/iommu/iommu.go @@ -56,6 +56,9 @@ func (s *iommuSource) GetLabels() (source.FeatureLabels, error) { return features, nil } +// DisableByDefault method of the SupplementalSource interface. +func (s *iommuSource) DisableByDefault() bool { return true } + func init() { source.Register(&src) }