diff --git a/README.md b/README.md index d7b992a0f..6b117114d 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ The current set of feature sources are the following: The published node labels encode a few pieces of information: -- A "namespace" (e.g. `node.alpha.kubernetes-incubator.io`). +- Namespace, i.e. `feature.node.kubernetes.io` - The version of this discovery code that wrote the label, according to `git describe --tags --dirty --always`. - The source for each label (e.g. `cpuid`). @@ -112,17 +112,17 @@ the only label value published for features is the string `"true"`._ ```json { - "node.alpha.kubernetes-incubator.io/node-feature-discovery.version": "v0.3.0", - "node.alpha.kubernetes-incubator.io/nfd-cpuid-": "true", - "node.alpha.kubernetes-incubator.io/nfd-iommu-": "true", - "node.alpha.kubernetes-incubator.io/nfd-kernel-version.": "", - "node.alpha.kubernetes-incubator.io/nfd-memory-": "true", - "node.alpha.kubernetes-incubator.io/nfd-network-": "true", - "node.alpha.kubernetes-incubator.io/nfd-pci-.present": "true", - "node.alpha.kubernetes-incubator.io/nfd-pstate-": "true", - "node.alpha.kubernetes-incubator.io/nfd-rdt-": "true", - "node.alpha.kubernetes-incubator.io/nfd-selinux-": "true", - "node.alpha.kubernetes-incubator.io/nfd-storage-": "true" + "feature.node.kubernetes.io/node-feature-discovery.version": "v0.3.0", + "feature.node.kubernetes.io/nfd-cpuid-": "true", + "feature.node.kubernetes.io/nfd-iommu-": "true", + "feature.node.kubernetes.io/nfd-kernel-version.": "", + "feature.node.kubernetes.io/nfd-memory-": "true", + "feature.node.kubernetes.io/nfd-network-": "true", + "feature.node.kubernetes.io/nfd-pci-.present": "true", + "feature.node.kubernetes.io/nfd-pstate-": "true", + "feature.node.kubernetes.io/nfd-rdt-": "true", + "feature.node.kubernetes.io/nfd-selinux-": "true", + "feature.node.kubernetes.io/nfd-storage-": "true" } ``` @@ -201,7 +201,7 @@ The set of fields used in `` is configurable, valid fields being Defaults fields are `class` and `vendor`. An example label using the default label fields: ``` -node.alpha.kubernetes-incubator.io/nfd-pci-1200_8086.present=true +feature.node.kubernetes.io/nfd-pci-1200_8086.present=true ``` Also the set of PCI device classes that the feature source detects is @@ -377,7 +377,7 @@ spec: - image: golang name: go1 nodeSelector: - node.alpha.kubernetes-incubator.io/nfd-pstate-turbo: 'true' + feature.node.kubernetes.io/nfd-pstate-turbo: 'true' ``` For more details on targeting nodes, see [node selection][node-sel]. diff --git a/demo/helper-scripts/demo-pod-with-discovery.yaml.cloverleaf.template b/demo/helper-scripts/demo-pod-with-discovery.yaml.cloverleaf.template index 6a91d9c27..a7b412f96 100644 --- a/demo/helper-scripts/demo-pod-with-discovery.yaml.cloverleaf.template +++ b/demo/helper-scripts/demo-pod-with-discovery.yaml.cloverleaf.template @@ -11,7 +11,7 @@ metadata: { "matchExpressions": [ { - "key": "node.alpha.kubernetes-incubator.io/nfd-pstate-turbo", + "key": "feature.node.kubernetes.io/nfd-pstate-turbo", "operator": "DoesNotExist" } ] diff --git a/demo/helper-scripts/demo-pod-with-discovery.yaml.parsec.template b/demo/helper-scripts/demo-pod-with-discovery.yaml.parsec.template index f98072341..6eac8dc69 100644 --- a/demo/helper-scripts/demo-pod-with-discovery.yaml.parsec.template +++ b/demo/helper-scripts/demo-pod-with-discovery.yaml.parsec.template @@ -10,5 +10,5 @@ spec: - containerPort: 3351 hostPort: 10001 nodeSelector: - node.alpha.kubernetes-incubator.io/nfd-pstate-turbo: 'true' + feature.node.kubernetes.io/nfd-pstate-turbo: 'true' restartPolicy: Never diff --git a/main.go b/main.go index 35d59adba..16422d26d 100644 --- a/main.go +++ b/main.go @@ -35,7 +35,7 @@ const ( ProgramName = "node-feature-discovery" // Namespace is the prefix for all published labels. - Namespace = "node.alpha.kubernetes-incubator.io" + Namespace = "feature.node.kubernetes.io" // NodeNameEnv is the environment variable that contains this node's name. NodeNameEnv = "NODE_NAME"