Merge pull request #236 from chr15p/extendedResources2

sync operator nfr crds with operand helm nfr crds
kubernetes-sigs · Jun 6, 2024 · 1788698 · 1788698
2 parents e7c559c + 5a3b33d
commit 1788698
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 225 deletions.
diff --git a/config/crd/bases/nfd.k8s-sigs.io_v1alpha1_nodefeaturerules.yaml b/config/crd/bases/nfd.k8s-sigs.io_v1alpha1_nodefeaturerules.yaml
@@ -43,6 +43,16 @@ spec:
                   description: Rule defines a rule for node customization such as
                     labeling.
                   properties:
+                    annotations:
+                      additionalProperties:
+                        type: string
+                      description: Annotations to create if the rule matches.
+                      type: object
+                    extendedResources:
+                      additionalProperties:
+                        type: string
+                      description: ExtendedResources to create if the rule matches.
+                      type: object
                     labels:
                       additionalProperties:
                         type: string
@@ -118,6 +128,38 @@ spec:
                                     MatchExpressions, each of which is evaluated against
                                     a set of input values.
                                   type: object
+                                matchName:
+                                  description: |-
+                                    MatchName in an expression that is matched against the name of each
+                                    element in the feature set.
+                                  properties:
+                                    op:
+                                      description: Op is the operator to be applied.
+                                      enum:
+                                      - In
+                                      - NotIn
+                                      - InRegexp
+                                      - Exists
+                                      - DoesNotExist
+                                      - Gt
+                                      - Lt
+                                      - GtLt
+                                      - IsTrue
+                                      - IsFalse
+                                      type: string
+                                    value:
+                                      description: |-
+                                        Value is the list of values that the operand evaluates the input
+                                        against. Value should be empty if the operator is Exists, DoesNotExist,
+                                        IsTrue or IsFalse. Value should contain exactly one element if the
+                                        operator is Gt or Lt and exactly two elements if the operator is GtLt.
+                                        In other cases Value should contain at least one element.
+                                      items:
+                                        type: string
+                                      type: array
+                                  required:
+                                  - op
+                                  type: object
                               required:
                               - feature
                               - matchExpressions
@@ -180,6 +222,38 @@ spec:
                             description: MatchExpressionSet contains a set of MatchExpressions,
                               each of which is evaluated against a set of input values.
                             type: object
+                          matchName:
+                            description: |-
+                              MatchName in an expression that is matched against the name of each
+                              element in the feature set.
+                            properties:
+                              op:
+                                description: Op is the operator to be applied.
+                                enum:
+                                - In
+                                - NotIn
+                                - InRegexp
+                                - Exists
+                                - DoesNotExist
+                                - Gt
+                                - Lt
+                                - GtLt
+                                - IsTrue
+                                - IsFalse
+                                type: string
+                              value:
+                                description: |-
+                                  Value is the list of values that the operand evaluates the input
+                                  against. Value should be empty if the operator is Exists, DoesNotExist,
+                                  IsTrue or IsFalse. Value should contain exactly one element if the
+                                  operator is Gt or Lt and exactly two elements if the operator is GtLt.
+                                  In other cases Value should contain at least one element.
+                                items:
+                                  type: string
+                                type: array
+                            required:
+                            - op
+                            type: object
                         required:
                         - feature
                         - matchExpressions

diff --git a/config/crd/bases/nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml b/config/crd/bases/nfd.kubernetes.io_v1alpha1_nodefeaturerules.yaml
diff --git a/config/manifests/bases/nfd-operator.clusterserviceversion.yaml b/config/manifests/bases/nfd-operator.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
           }
         },
         {
-          "apiVersion": "nfd.kubernetes.io/v1alpha1",
+          "apiVersion": "nfd.k8s-sigs.io/v1alpha1",
           "kind": "NodeFeatureRule",
           "metadata": {
             "name": "my-sample-rule-object"
@@ -97,7 +97,7 @@ spec:
     - description: |
         NodeFeatureRule resource specifies a configuration for feature-based customization of node objects, such as node labeling.
       kind: NodeFeatureRule
-      name: nodefeaturerules.nfd.kubernetes.io
+      name: nodefeaturerules.nfd.k8s-sigs.io
       version: v1alpha1
     - description: |
         NodeResourceTopology resource describes node resources and their topology.

diff --git a/...ernetes.io_v1alpha1_nodefeaturerules.yaml → ...8s-sigs.io_v1alpha1_nodefeaturerules.yaml b/...ernetes.io_v1alpha1_nodefeaturerules.yaml → ...8s-sigs.io_v1alpha1_nodefeaturerules.yaml
@@ -1,4 +1,4 @@
-apiVersion: nfd.kubernetes.io/v1alpha1
+apiVersion: nfd.k8s-sigs.io/v1alpha1
 kind: NodeFeatureRule
 metadata:
   name: my-sample-rule-object
@@ -13,4 +13,4 @@ spec:
             dummy: {op: Exists}
         - feature: kernel.config
           matchExpressions:
-            X86: {op: In, value: ["y"]}
+            X86: {op: In, value: ["y"]}