mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2025-03-17 05:48:21 +00:00
source/iommu: deprecate and disable by default
Deprecate the iommu source and disable it by default.
This commit is contained in:
parent
a6eddbab4f
commit
838a375f85
4 changed files with 8 additions and 4 deletions
|
@ -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 | capable | The node has an RDMA capable Network adapter |
|
||||||
| rdma | enabled | The node has the needed RDMA modules loaded to run RDMA traffic |
|
| 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:
|
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
|
| enabled | IOMMU is present and enabled in the kernel
|
||||||
|
|
||||||
|
**DEPRECATED**: The **iommu** source is deprecated and not enabled by default.
|
||||||
|
|
||||||
### Kernel
|
### Kernel
|
||||||
|
|
||||||
The **kernel** feature source supports the following labels:
|
The **kernel** feature source supports the following labels:
|
||||||
|
|
|
@ -52,7 +52,6 @@ supposed to be running on each node of the cluster.
|
||||||
Feature discovery is divided into domain-specific feature sources:
|
Feature discovery is divided into domain-specific feature sources:
|
||||||
|
|
||||||
- CPU
|
- CPU
|
||||||
- IOMMU
|
|
||||||
- Kernel
|
- Kernel
|
||||||
- Memory
|
- Memory
|
||||||
- Network
|
- Network
|
||||||
|
@ -62,6 +61,7 @@ Feature discovery is divided into domain-specific feature sources:
|
||||||
- USB
|
- USB
|
||||||
- Custom (rule-based custom features)
|
- Custom (rule-based custom features)
|
||||||
- Local (hooks for user-specific features)
|
- Local (hooks for user-specific features)
|
||||||
|
- IOMMU (*deprecated*)
|
||||||
|
|
||||||
Each feature source is responsible for detecting a set of features which. in
|
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
|
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-<feature-name>": "true",
|
"feature.node.kubernetes.io/cpu-<feature-name>": "true",
|
||||||
"feature.node.kubernetes.io/custom-<feature-name>": "true",
|
"feature.node.kubernetes.io/custom-<feature-name>": "true",
|
||||||
"feature.node.kubernetes.io/iommu-<feature-name>": "true",
|
|
||||||
"feature.node.kubernetes.io/kernel-<feature name>": "<feature value>",
|
"feature.node.kubernetes.io/kernel-<feature name>": "<feature value>",
|
||||||
"feature.node.kubernetes.io/memory-<feature-name>": "true",
|
"feature.node.kubernetes.io/memory-<feature-name>": "true",
|
||||||
"feature.node.kubernetes.io/network-<feature-name>": "true",
|
"feature.node.kubernetes.io/network-<feature-name>": "true",
|
||||||
|
|
|
@ -317,7 +317,7 @@ func TestNewNfdWorker(t *testing.T) {
|
||||||
So(worker.configure("", ""), ShouldBeNil)
|
So(worker.configure("", ""), ShouldBeNil)
|
||||||
Convey("all sources should be enabled and the whitelist regexp should be empty", func() {
|
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.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)
|
So(worker.config.Core.LabelWhiteList, ShouldResemble, emptyRegexp)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -56,6 +56,9 @@ func (s *iommuSource) GetLabels() (source.FeatureLabels, error) {
|
||||||
return features, nil
|
return features, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DisableByDefault method of the SupplementalSource interface.
|
||||||
|
func (s *iommuSource) DisableByDefault() bool { return true }
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
source.Register(&src)
|
source.Register(&src)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue