diff --git a/docs/usage/features.md b/docs/usage/features.md index 3427d8e25d..5d869610a5 100644 --- a/docs/usage/features.md +++ b/docs/usage/features.md @@ -54,7 +54,6 @@ feature.node.kubernetes.io/ = | **`cpu-pstate.turbo`** | bool | Set to 'true' if turbo frequencies are enabled in Intel pstate driver, set to 'false' if they have been disabled. | | **`cpu-pstate.scaling_governor`** | string | The value of the Intel pstate scaling_governor when in use, either 'powersave' or 'performance'. | | **`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. | -| **`cpu-rdt.`** | true | **DEPRECATED** [Intel RDT][intel-rdt] capability is supported. See [RDT flags](customization-guide.md#intel-rdt-flags) for details. | | **`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). | | **`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) | | **`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/ = | **`cpu-model.family`** | int | CPU family. | | **`cpu-model.id`** | int | CPU model number. | -> **NOTE:** the `cpu-rdt.` labels are deprecated and will be removed -> in a future release. They will remain to be available as features -> for [NodeFeatureRule](custom-resources.md#nodefeaturerule) to consume. -> See [customization guide](customization-guide.md#nodefeaturerule-custom-resource) -> for details how to use NodeFeatureRule objects to create labels. - The CPU label source is configurable, see [worker configuration](nfd-worker.md#worker-configuration) and [`sources.cpu`](../reference/worker-configuration-reference.md#sourcescpu) @@ -270,7 +263,6 @@ have a sufficient capacity of said resource left. [klauspost-cpuid]: https://github.com/klauspost/cpuid#x86-cpu-instructions -[intel-rdt]: http://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html [intel-pstate]: https://www.kernel.org/doc/Documentation/cpu-freq/intel-pstate.txt [intel-sst]: https://www.intel.com/content/www/us/en/architecture-and-technology/speed-select-technology-article.html [sriov]: http://www.intel.com/content/www/us/en/pci-express/pci-sig-sr-iov-primer-sr-iov-technology-paper.html diff --git a/source/cpu/cpu.go b/source/cpu/cpu.go index edb35dff6b..ea34408519 100644 --- a/source/cpu/cpu.go +++ b/source/cpu/cpu.go @@ -165,15 +165,6 @@ func (s *cpuSource) GetLabels() (source.FeatureLabels, error) { labels["pstate."+k] = v } - // RDT - for k, v := range features.Attributes[RdtFeature].Elements { - if k == "RDTL3CA_NUM_CLOSID" { - continue - } - - labels["rdt."+k] = v - } - // Security // skipLabel lists features that will not have labels created but are only made available for // NodeFeatureRules (e.g. to be published via extended resources instead) diff --git a/test/e2e/e2e-test-config.example.yaml b/test/e2e/e2e-test-config.example.yaml index 5c7b6454fb..746ec6bff6 100644 --- a/test/e2e/e2e-test-config.example.yaml +++ b/test/e2e/e2e-test-config.example.yaml @@ -47,11 +47,6 @@ defaultFeatures: - "feature.node.kubernetes.io/cpu-pstate.status" - "feature.node.kubernetes.io/cpu-pstate.scaling_governor" - "feature.node.kubernetes.io/cpu-pstate.turbo" - - "feature.node.kubernetes.io/cpu-rdt.RDTCMT" - - "feature.node.kubernetes.io/cpu-rdt.RDTL3CA" - - "feature.node.kubernetes.io/cpu-rdt.RDTMBA" - - "feature.node.kubernetes.io/cpu-rdt.RDTMBM" - - "feature.node.kubernetes.io/cpu-rdt.RDTMON" - "feature.node.kubernetes.io/kernel-config.NO_HZ" - "feature.node.kubernetes.io/kernel-config.NO_HZ_FULL" - "feature.node.kubernetes.io/kernel-config.NO_HZ_IDLE"