From b96b86bc6c451e8dddfe44c949d9ea1383d27852 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 17 Nov 2021 16:40:28 +0200 Subject: [PATCH] pkg/apis/nfd: drop excess field from the CRD Drop stale leftover "LabelsTemplate" field from the rule spec. --- deployment/base/nfd-crds/nodefeaturerule-crd.yaml | 6 ------ .../manifests/nodefeaturerule-crd.yaml | 6 ------ pkg/apis/nfd/v1alpha1/types.go | 6 ------ 3 files changed, 18 deletions(-) diff --git a/deployment/base/nfd-crds/nodefeaturerule-crd.yaml b/deployment/base/nfd-crds/nodefeaturerule-crd.yaml index 277a1508f5..1f273e6c7b 100644 --- a/deployment/base/nfd-crds/nodefeaturerule-crd.yaml +++ b/deployment/base/nfd-crds/nodefeaturerule-crd.yaml @@ -48,12 +48,6 @@ spec: type: string description: Labels to create if the rule matches. type: object - labelsTemplate: - description: LabelsTemplate specifies a template to expand for - dynamically generating multiple labels. Data (after template - expansion) must be keys with an optional value ([=]) - separated by newlines. - type: string matchAny: description: MatchAny specifies a list of matchers one of which must match. diff --git a/deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml b/deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml index 277a1508f5..1f273e6c7b 100644 --- a/deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml +++ b/deployment/helm/node-feature-discovery/manifests/nodefeaturerule-crd.yaml @@ -48,12 +48,6 @@ spec: type: string description: Labels to create if the rule matches. type: object - labelsTemplate: - description: LabelsTemplate specifies a template to expand for - dynamically generating multiple labels. Data (after template - expansion) must be keys with an optional value ([=]) - separated by newlines. - type: string matchAny: description: MatchAny specifies a list of matchers one of which must match. diff --git a/pkg/apis/nfd/v1alpha1/types.go b/pkg/apis/nfd/v1alpha1/types.go index 75cdadcef2..7b961c209f 100644 --- a/pkg/apis/nfd/v1alpha1/types.go +++ b/pkg/apis/nfd/v1alpha1/types.go @@ -57,12 +57,6 @@ type Rule struct { // +optional Labels map[string]string `json:"labels"` - // LabelsTemplate specifies a template to expand for dynamically generating - // multiple labels. Data (after template expansion) must be keys with an - // optional value ([=]) separated by newlines. - // +optional - LabelsTemplate string `json:"labelsTemplate"` - // MatchFeatures specifies a set of matcher terms all of which must match. // +optional MatchFeatures FeatureMatcher `json:"matchFeatures"`