Skip to content

Commit 1788698

Browse files
authored
Merge pull request #236 from chr15p/extendedResources2
sync operator nfr crds with operand helm nfr crds
2 parents e7c559c + 5a3b33d commit 1788698

File tree

5 files changed

+152
-225
lines changed

5 files changed

+152
-225
lines changed

config/crd/bases/nfd.k8s-sigs.io_v1alpha1_nodefeaturerules.yaml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,16 @@ spec:
4343
description: Rule defines a rule for node customization such as
4444
labeling.
4545
properties:
46+
annotations:
47+
additionalProperties:
48+
type: string
49+
description: Annotations to create if the rule matches.
50+
type: object
51+
extendedResources:
52+
additionalProperties:
53+
type: string
54+
description: ExtendedResources to create if the rule matches.
55+
type: object
4656
labels:
4757
additionalProperties:
4858
type: string
@@ -118,6 +128,38 @@ spec:
118128
MatchExpressions, each of which is evaluated against
119129
a set of input values.
120130
type: object
131+
matchName:
132+
description: |-
133+
MatchName in an expression that is matched against the name of each
134+
element in the feature set.
135+
properties:
136+
op:
137+
description: Op is the operator to be applied.
138+
enum:
139+
- In
140+
- NotIn
141+
- InRegexp
142+
- Exists
143+
- DoesNotExist
144+
- Gt
145+
- Lt
146+
- GtLt
147+
- IsTrue
148+
- IsFalse
149+
type: string
150+
value:
151+
description: |-
152+
Value is the list of values that the operand evaluates the input
153+
against. Value should be empty if the operator is Exists, DoesNotExist,
154+
IsTrue or IsFalse. Value should contain exactly one element if the
155+
operator is Gt or Lt and exactly two elements if the operator is GtLt.
156+
In other cases Value should contain at least one element.
157+
items:
158+
type: string
159+
type: array
160+
required:
161+
- op
162+
type: object
121163
required:
122164
- feature
123165
- matchExpressions
@@ -180,6 +222,38 @@ spec:
180222
description: MatchExpressionSet contains a set of MatchExpressions,
181223
each of which is evaluated against a set of input values.
182224
type: object
225+
matchName:
226+
description: |-
227+
MatchName in an expression that is matched against the name of each
228+
element in the feature set.
229+
properties:
230+
op:
231+
description: Op is the operator to be applied.
232+
enum:
233+
- In
234+
- NotIn
235+
- InRegexp
236+
- Exists
237+
- DoesNotExist
238+
- Gt
239+
- Lt
240+
- GtLt
241+
- IsTrue
242+
- IsFalse
243+
type: string
244+
value:
245+
description: |-
246+
Value is the list of values that the operand evaluates the input
247+
against. Value should be empty if the operator is Exists, DoesNotExist,
248+
IsTrue or IsFalse. Value should contain exactly one element if the
249+
operator is Gt or Lt and exactly two elements if the operator is GtLt.
250+
In other cases Value should contain at least one element.
251+
items:
252+
type: string
253+
type: array
254+
required:
255+
- op
256+
type: object
183257
required:
184258
- feature
185259
- matchExpressions

config/crd/bases/nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml

Lines changed: 0 additions & 221 deletions
This file was deleted.

config/manifests/bases/nfd-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ metadata:
2323
}
2424
},
2525
{
26-
"apiVersion": "nfd.kubernetes.io/v1alpha1",
26+
"apiVersion": "nfd.k8s-sigs.io/v1alpha1",
2727
"kind": "NodeFeatureRule",
2828
"metadata": {
2929
"name": "my-sample-rule-object"
@@ -97,7 +97,7 @@ spec:
9797
- description: |
9898
NodeFeatureRule resource specifies a configuration for feature-based customization of node objects, such as node labeling.
9999
kind: NodeFeatureRule
100-
name: nodefeaturerules.nfd.kubernetes.io
100+
name: nodefeaturerules.nfd.k8s-sigs.io
101101
version: v1alpha1
102102
- description: |
103103
NodeResourceTopology resource describes node resources and their topology.

config/samples/nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml renamed to config/samples/nodefeaturerules.nfd.k8s-sigs.io_v1alpha1_nodefeaturerules.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: nfd.kubernetes.io/v1alpha1
1+
apiVersion: nfd.k8s-sigs.io/v1alpha1
22
kind: NodeFeatureRule
33
metadata:
44
name: my-sample-rule-object
@@ -13,4 +13,4 @@ spec:
1313
dummy: {op: Exists}
1414
- feature: kernel.config
1515
matchExpressions:
16-
X86: {op: In, value: ["y"]}
16+
X86: {op: In, value: ["y"]}

0 commit comments

Comments
 (0)