Skip to content

Commit cd18fe8

Browse files
committed
source/cpu: drop deprecated cpu-rdt labels
Drop RDT labels that were deprecated in NFD v0.13. The RDT features remain available for NodeFeatureRules to serve custom labeling.
1 parent 456a77b commit cd18fe8

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

docs/usage/features.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ feature.node.kubernetes.io/<feature> = <value>
5454
| **`cpu-pstate.turbo`** | bool | Set to 'true' if turbo frequencies are enabled in Intel pstate driver, set to 'false' if they have been disabled. |
5555
| **`cpu-pstate.scaling_governor`** | string | The value of the Intel pstate scaling_governor when in use, either 'powersave' or 'performance'. |
5656
| **`cpu-cstate.enabled`** | bool | Set to 'true' if cstates are set in the intel_idle driver, otherwise set to 'false'. Unset if intel_idle cpuidle driver is not active. |
57-
| **`cpu-rdt.<rdt-flag>`** | true | **DEPRECATED** [Intel RDT][intel-rdt] capability is supported. See [RDT flags](customization-guide.md#intel-rdt-flags) for details. |
5857
| **`cpu-security.sgx.enabled`** | true | Set to 'true' if Intel SGX is enabled in BIOS (based on a non-zero sum value of SGX EPC section sizes). |
5958
| **`cpu-security.se.enabled`** | true | Set to 'true' if IBM Secure Execution for Linux (IBM Z & LinuxONE) is available and enabled (requires `/sys/firmware/uv/prot_virt_host` facility) |
6059
| **`cpu-security.tdx.enabled`** | true | Set to 'true' if Intel TDX is available on the host and has been enabled (requires `/sys/module/kvm_intel/parameters/tdx`). |
@@ -66,12 +65,6 @@ feature.node.kubernetes.io/<feature> = <value>
6665
| **`cpu-model.family`** | int | CPU family. |
6766
| **`cpu-model.id`** | int | CPU model number. |
6867

69-
> **NOTE:** the `cpu-rdt.<rdt-flag>` labels are deprecated and will be removed
70-
> in a future release. They will remain to be available as features
71-
> for [NodeFeatureRule](custom-resources.md#nodefeaturerule) to consume.
72-
> See [customization guide](customization-guide.md#nodefeaturerule-custom-resource)
73-
> for details how to use NodeFeatureRule objects to create labels.
74-
7568
The CPU label source is configurable, see
7669
[worker configuration](nfd-worker.md#worker-configuration) and
7770
[`sources.cpu`](../reference/worker-configuration-reference.md#sourcescpu)
@@ -270,7 +263,6 @@ have a sufficient capacity of said resource left.
270263

271264
<!-- Links -->
272265
[klauspost-cpuid]: https://github.com/klauspost/cpuid#x86-cpu-instructions
273-
[intel-rdt]: http://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
274266
[intel-pstate]: https://www.kernel.org/doc/Documentation/cpu-freq/intel-pstate.txt
275267
[intel-sst]: https://www.intel.com/content/www/us/en/architecture-and-technology/speed-select-technology-article.html
276268
[sriov]: http://www.intel.com/content/www/us/en/pci-express/pci-sig-sr-iov-primer-sr-iov-technology-paper.html

source/cpu/cpu.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,6 @@ func (s *cpuSource) GetLabels() (source.FeatureLabels, error) {
165165
labels["pstate."+k] = v
166166
}
167167

168-
// RDT
169-
for k, v := range features.Attributes[RdtFeature].Elements {
170-
if k == "RDTL3CA_NUM_CLOSID" {
171-
continue
172-
}
173-
174-
labels["rdt."+k] = v
175-
}
176-
177168
// Security
178169
// skipLabel lists features that will not have labels created but are only made available for
179170
// NodeFeatureRules (e.g. to be published via extended resources instead)

test/e2e/e2e-test-config.example.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ defaultFeatures:
4747
- "feature.node.kubernetes.io/cpu-pstate.status"
4848
- "feature.node.kubernetes.io/cpu-pstate.scaling_governor"
4949
- "feature.node.kubernetes.io/cpu-pstate.turbo"
50-
- "feature.node.kubernetes.io/cpu-rdt.RDTCMT"
51-
- "feature.node.kubernetes.io/cpu-rdt.RDTL3CA"
52-
- "feature.node.kubernetes.io/cpu-rdt.RDTMBA"
53-
- "feature.node.kubernetes.io/cpu-rdt.RDTMBM"
54-
- "feature.node.kubernetes.io/cpu-rdt.RDTMON"
5550
- "feature.node.kubernetes.io/kernel-config.NO_HZ"
5651
- "feature.node.kubernetes.io/kernel-config.NO_HZ_FULL"
5752
- "feature.node.kubernetes.io/kernel-config.NO_HZ_IDLE"

0 commit comments

Comments
 (0)