mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

Merge pull request #1017 from marquiz/devel/nfd-api-optional-fields

Browse source 
apis/nfd: make all fields in NodeFeatureSpec optional
This commit is contained in:
Kubernetes Prow Robot 2022-12-27 00:45:28 -08:00 committed by GitHub
commit e97b2c1579
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
deployment/base/nfd-crds/nfd-api-crds.yaml
View file

@ -52,6 +52,8 @@ spec:
required:
- elements
type: object
description: Attributes contains all the attribute-type features
of the node.
type: object
flags:
additionalProperties:
@ -67,6 +69,8 @@ spec:
required:
- elements
type: object
description: Flags contains all the flag-type features of the
node.
type: object
instances:
additionalProperties:
@ -89,11 +93,9 @@ spec:
required:
- elements
type: object
description: Instances contains all the instance-type features
of the node.
type: object
required:
- attributes
- flags
- instances
type: object
labels:
additionalProperties:
@ -101,8 +103,6 @@ spec:
description: Labels is the set of node labels that are requested to
be created.
type: object
required:
- features
type: object
required:
- spec

12
deployment/helm/node-feature-discovery/crds/nfd-api-crds.yaml
View file

@ -52,6 +52,8 @@ spec:
required:
- elements
type: object
description: Attributes contains all the attribute-type features
of the node.
type: object
flags:
additionalProperties:
@ -67,6 +69,8 @@ spec:
required:
- elements
type: object
description: Flags contains all the flag-type features of the
node.
type: object
instances:
additionalProperties:
@ -89,11 +93,9 @@ spec:
required:
- elements
type: object
description: Instances contains all the instance-type features
of the node.
type: object
required:
- attributes
- flags
- instances
type: object
labels:
additionalProperties:
@ -101,8 +103,6 @@ spec:
description: Labels is the set of node labels that are requested to
be created.
type: object
required:
- features
type: object
required:
- spec

6
pkg/apis/nfd/v1alpha1/generated.proto
View file

@ -35,10 +35,16 @@ message AttributeFeatureSet {
//
// +protobuf=true
message Features {
// Flags contains all the flag-type features of the node.
// +optional
map<string, FlagFeatureSet> flags = 1;
// Attributes contains all the attribute-type features of the node.
// +optional
map<string, AttributeFeatureSet> vattributes = 2;
// Instances contains all the instance-type features of the node.
// +optional
map<string, InstanceFeatureSet> instances = 3;
}

11
pkg/apis/nfd/v1alpha1/types.go
View file

@ -46,6 +46,7 @@ type NodeFeature struct {
// NodeFeatureSpec describes a NodeFeature object.
type NodeFeatureSpec struct {
// Features is the full "raw" features data that has been discovered.
// +optional
Features Features `json:"features"`
// Labels is the set of node labels that are requested to be created.
// +optional
@ -56,9 +57,15 @@ type NodeFeatureSpec struct {
//
// +protobuf=true
type Features struct {
Flags map[string]FlagFeatureSet `json:"flags" protobuf:"bytes,1,rep,name=flags"`
// Flags contains all the flag-type features of the node.
// +optional
Flags map[string]FlagFeatureSet `json:"flags" protobuf:"bytes,1,rep,name=flags"`
// Attributes contains all the attribute-type features of the node.
// +optional
Attributes map[string]AttributeFeatureSet `json:"attributes" protobuf:"bytes,2,rep,name=vattributes"`
Instances map[string]InstanceFeatureSet `json:"instances" protobuf:"bytes,3,rep,name=instances"`
// Instances contains all the instance-type features of the node.
// +optional
Instances map[string]InstanceFeatureSet `json:"instances" protobuf:"bytes,3,rep,name=instances"`
}
// FlagFeatureSet is a set of simple features only containing names without values.