mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-15 17:50:49 +00:00
e206f0b86b
Implement generic feature matchers that cover all feature sources (that implement the FeatureSource interface). The implementation relies on the unified data model provided by the FeatureSource interface as well as the generic expression-based rule processing framework that was added to the source/custom/expression package. With this patch any new features added will be automatically available for custom rules, without any additional work. Rule hierarchy follows the source/feature hierarchy by design. This patch introduces a new format for custom rule specifications, dropping the 'value' field and introducing new 'labels' field which makes it possible to specify multiple labels per rule. Also, in the new format the 'name' field is just for reference and no matching label is created. The new generic rules are available in this new rule format under a 'matchFeatures. MatchFeatures implements a logical AND over an array of per-feature matchers - i.e. a match for all of the matchers is required. The goal of the new rule format is to make it better follow K8s API design guidelines and make it extensible for future enhancements (e.g. addition of templating, taints, annotations, extended resources etc). The old rule format (with cpuID, kConfig, loadedKMod, nodename, pciID, usbID rules) is still supported. The rule format (new vs. old) is determined at config parsing time based on the existence of the 'matchOn' field. The new rule format and the configuration format for the new matchFeatures field is - name: <rule-name> labels: <key>: <value> ... matchFeatures: - feature: <domain>.<feature> matchExpressions: <attribute>: op: <operator> value: - <list-of-values> - feature: <domain>.<feature> ... Currently, "cpu", "kernel", "pci", "system", "usb" and "local" sources are covered by the matshers/feature selectors. Thus, the following features are available for matching with this patch: - cpu.cpuid: <cpuid-flag>: <exists/does-not-exist> - cpu.cstate: enabled: <bool> - cpu.pstate: status: <string> turbo: <bool> scaling_governor: <string> - cpu.rdt: <rdt-feature>: <exists/does-not-exist> - cpu.sst: bf.enabled: <bool> - cpu.topology: hardware_multithreading: <bool> - kernel.config: <flag-name>: <string> - kernel.loadedmodule: <module-name>: <exists/does-not-exist> - kernel.selinux: enabled: <bool> - kernel.version: major: <int> minor: <int> revision: <int> full: <string> - system.osrelease: <key-name>: <string> VERSION_ID.major: <int> VERSION_ID.minor: <int> - system.name: nodename: <string> - pci.device: <device-instance>: class: <string> vendor: <string> device: <string> subsystem_vendor: <string> susbystem_device: <string> sriov_totalvfs: <int> - usb.device: <device-instance>: class: <string> vendor: <string> device: <string> serial: <string> - local.label: <label-name>: <string> The configuration also supports some "shortforms" for convenience: matchExpressions: [<attr-1>, <attr-2>=<val-2>] --- matchExpressions: <attr-3>: <attr-4>: <val-4> is equal to: matchExpressions: <attr-1>: {op: Exists} <attr-2>: {op: In, value: [<val-2>]} --- matchExpressions: <attr-3>: {op: Exists} <attr-4>: {op: In, value: [<val-4>]} In other words: - feature: kernel.config matchExpressions: ["X86", "INIT_ENV_ARG_LIMIT=32"] - feature: pci.device matchExpressions: vendor: "8086" is the same as: - feature: kernel.config matchExpressions: X86: {op: Exists} INIT_ENV_ARG_LIMIT: {op: In, values: ["32"]} - feature: pci.device matchExpressions: vendor: {op: In, value: ["8086"] Some configuration examples below. In order to match a CPUID feature the following snippet can be used: - name: cpu-test-1 labels: cpu-custom-feature: "true" matchFeatures: - feature: cpu.cpuid matchExpressions: AESNI: {op: Exists} AVX: {op: Exists} In order to match against a loaded kernel module and OS version: - name: kernel-test-1 labels: kernel-custom-feature: "true" matchFeatures: - feature: kernel.loadedmodule matchExpressions: e1000: {op: Exists} - feature: system.osrelease matchExpressions: NAME: {op: InRegexp, values: ["^openSUSE"]} VERSION_ID.major: {op: Gt, values: ["14"]} In order to require a kernel module and both of two specific PCI devices: - name: multi-device-test labels: multi-device-feature: "true" matchFeatures: - feature: kernel.loadedmodule matchExpressions: driver-module: {op: Exists} - pci.device: vendor: "8086" device: "1234" - pci.device: vendor: "8086" device: "abcd"
89 lines
2.5 KiB
Go
89 lines
2.5 KiB
Go
/*
|
|
Copyright 2021 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package custom
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"k8s.io/klog/v2"
|
|
"sigs.k8s.io/yaml"
|
|
)
|
|
|
|
// Directory stores the full path for the custom sources folder
|
|
const Directory = "/etc/kubernetes/node-feature-discovery/custom.d"
|
|
|
|
// getDirectoryFeatureConfig returns features configured in the "/etc/kubernetes/node-feature-discovery/custom.d"
|
|
// host directory and its 1st level subdirectories, which can be populated e.g. by ConfigMaps
|
|
func getDirectoryFeatureConfig() []CustomRule {
|
|
features := readDir(Directory, true)
|
|
klog.V(1).Infof("all configmap based custom feature specs: %+v", features)
|
|
return features
|
|
}
|
|
|
|
func readDir(dirName string, recursive bool) []CustomRule {
|
|
features := make([]CustomRule, 0)
|
|
|
|
klog.V(1).Infof("getting files in %s", dirName)
|
|
files, err := ioutil.ReadDir(dirName)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
klog.V(1).Infof("custom config directory %q does not exist", dirName)
|
|
} else {
|
|
klog.Errorf("unable to access custom config directory %q, %v", dirName, err)
|
|
}
|
|
return features
|
|
}
|
|
|
|
for _, file := range files {
|
|
fileName := filepath.Join(dirName, file.Name())
|
|
|
|
if file.IsDir() {
|
|
if recursive {
|
|
klog.V(1).Infof("processing dir %q", fileName)
|
|
features = append(features, readDir(fileName, false)...)
|
|
} else {
|
|
klog.V(2).Infof("skipping dir %q", fileName)
|
|
}
|
|
continue
|
|
}
|
|
if strings.HasPrefix(file.Name(), ".") {
|
|
klog.V(2).Infof("skipping hidden file %q", fileName)
|
|
continue
|
|
}
|
|
klog.V(2).Infof("processing file %q", fileName)
|
|
|
|
bytes, err := ioutil.ReadFile(fileName)
|
|
if err != nil {
|
|
klog.Errorf("could not read custom config file %q, %v", fileName, err)
|
|
continue
|
|
}
|
|
klog.V(2).Infof("custom config rules raw: %s", string(bytes))
|
|
|
|
config := &[]CustomRule{}
|
|
err = yaml.UnmarshalStrict(bytes, config)
|
|
if err != nil {
|
|
klog.Errorf("could not parse custom config file %q, %v", fileName, err)
|
|
continue
|
|
}
|
|
|
|
features = append(features, *config...)
|
|
}
|
|
return features
|
|
}
|