Skip to content

Make slight changes to the CRDs #736

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

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Make slight changes to the CRDs #736

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
2 changes: 1 addition & 1 deletion api-hub/v1beta1/managedclustermodule_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type ManagedClusterModuleSpec struct {
ModuleSpec kmmv1beta1.ModuleSpec `json:"moduleSpec,omitempty"`

// SpokeNamespace describes the Spoke namespace, in which the ModuleSpec should be applied.
SpokeNamespace string `json:"spokeNamespace,omitempty"`
SpokeNamespace string `json:"spokeNamespace"`

// Selector describes on which managed clusters the ModuleSpec should be applied.
Selector map[string]string `json:"selector"`
Expand Down
4 changes: 3 additions & 1 deletion api/v1beta1/module_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ type ModprobeArgs struct {

type ModprobeSpec struct {
// ModuleName is the name of the Module to be loaded.
ModuleName string `json:"moduleName"`
// This field can only be unset if rawArgs is set.
// +optional
ModuleName string `json:"moduleName,omitempty"`

// Parameters is an optional list of kernel module parameters to be provided to modprobe.
// They should be in the form of key=value and will be separated by spaces in the modprobe command.
Expand Down
8 changes: 4 additions & 4 deletions config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2371,8 +2371,9 @@ spec:
The firmware(s) will be copied to the host for the kernel to find them.
type: string
moduleName:
description: ModuleName is the name of the Module
to be loaded.
description: |-
ModuleName is the name of the Module to be loaded.
This field can only be unset if rawArgs is set.
type: string
modulesLoadingOrder:
description: |-
Expand Down Expand Up @@ -2418,8 +2419,6 @@ spec:
minItems: 1
type: array
type: object
required:
- moduleName
type: object
registryTLS:
description: RegistryTLS set the TLS configs for accessing
Expand Down Expand Up @@ -2531,6 +2530,7 @@ spec:
type: string
required:
- selector
- spokeNamespace
type: object
status:
description: ManagedClusterModuleStatus defines the observed state of
Expand Down
7 changes: 3 additions & 4 deletions config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2348,8 +2348,9 @@ spec:
The firmware(s) will be copied to the host for the kernel to find them.
type: string
moduleName:
description: ModuleName is the name of the Module to be
loaded.
description: |-
ModuleName is the name of the Module to be loaded.
This field can only be unset if rawArgs is set.
type: string
modulesLoadingOrder:
description: |-
Expand Down Expand Up @@ -2395,8 +2396,6 @@ spec:
minItems: 1
type: array
type: object
required:
- moduleName
type: object
registryTLS:
description: RegistryTLS set the TLS configs for accessing
Expand Down
14 changes: 6 additions & 8 deletions config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ spec:
The firmware(s) will be copied to the host for the kernel to find them.
type: string
moduleName:
description: ModuleName is the name of the Module to
be loaded.
description: |-
ModuleName is the name of the Module to be loaded.
This field can only be unset if rawArgs is set.
type: string
modulesLoadingOrder:
description: |-
Expand Down Expand Up @@ -143,8 +144,6 @@ spec:
minItems: 1
type: array
type: object
required:
- moduleName
type: object
required:
- containerImage
Expand Down Expand Up @@ -236,8 +235,9 @@ spec:
The firmware(s) will be copied to the host for the kernel to find them.
type: string
moduleName:
description: ModuleName is the name of the Module to
be loaded.
description: |-
ModuleName is the name of the Module to be loaded.
This field can only be unset if rawArgs is set.
type: string
modulesLoadingOrder:
description: |-
Expand Down Expand Up @@ -283,8 +283,6 @@ spec:
minItems: 1
type: array
type: object
required:
- moduleName
type: object
required:
- containerImage
Expand Down