Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Instance and WorkerConfig optional by default #70

Merged
merged 1 commit into from
May 26, 2021
Merged

Make Instance and WorkerConfig optional by default #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions api/v1/nodefeaturediscovery_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@ import (
// NodeFeatureDiscoverySpec defines the desired state of NodeFeatureDiscovery
// +k8s:openapi-gen=true
type NodeFeatureDiscoverySpec struct {
Operand OperandSpec `json:"operand"`
Instance string `json:"instance"`
WorkerConfig ConfigMap `json:"workerConfig"`
Operand OperandSpec `json:"operand"`

// Instance name. Used to separate annotation namespaces for
// multiple parallel deployments.
// +optional
Instance string `json:"instance"`

// WorkerConfig describes configuration options for the NFD
// worker.
// +optional
WorkerConfig ConfigMap `json:"workerConfig"`
}

// OperandSpec describes configuration options for the operand
Expand Down
7 changes: 4 additions & 3 deletions config/crd/bases/nfd.kubernetes.io_nodefeaturediscoveries.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ spec:
description: NodeFeatureDiscoverySpec defines the desired state of NodeFeatureDiscovery
properties:
instance:
description: Instance name. Used to separate annotation namespaces for multiple parallel deployments.
description: Instance name. Used to separate annotation namespaces
for multiple parallel deployments.
type: string
operand:
description: OperandSpec describes configuration options for the operand
Expand All @@ -63,7 +64,8 @@ spec:
type: integer
type: object
workerConfig:
description: WorkerConfig describes configuration options for the NFD worker
description: WorkerConfig describes configuration options for the
NFD worker.
properties:
configData:
description: BinaryData holds the NFD configuration file
Expand All @@ -73,7 +75,6 @@ spec:
type: object
required:
- operand
- workerConfig
type: object
status:
description: NodeFeatureDiscoveryStatus defines the observed state of
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,4 +316,3 @@ rules:
- update
- use
- watch

1 change: 1 addition & 0 deletions config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: nfd-master-server
namespace: node-feature-discovery-operator
spec:
instance: "" # instance is empty by default
operand:
namespace: node-feature-discovery-operator
image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
Expand Down