Make slight changes to the CRDs (#736)

Module: make moduleName an optional field.
ManagedClusterModule: make spokeNamespace a required field.

Author: qbarrand

api-hub/v1beta1/managedclustermodule_types.go

@@ -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"`

api/v1beta1/module_types.go

@@ -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.

config/crd-hub/bases/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml

@@ -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: |-
@@ -2418,8 +2419,6 @@ spec:
                                     minItems: 1
                                     type: array
                                 type: object
-                            required:
-                            - moduleName
                             type: object
                           registryTLS:
                             description: RegistryTLS set the TLS configs for accessing
@@ -2531,6 +2530,7 @@ spec:
                 type: string
             required:
             - selector
+            - spokeNamespace
             type: object
           status:
             description: ManagedClusterModuleStatus defines the observed state of

config/crd/bases/kmm.sigs.x-k8s.io_modules.yaml

@@ -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: |-
@@ -2395,8 +2396,6 @@ spec:
                                 minItems: 1
                                 type: array
                             type: object
-                        required:
-                        - moduleName
                         type: object
                       registryTLS:
                         description: RegistryTLS set the TLS configs for accessing

config/crd/bases/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml

@@ -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: |-
@@ -143,8 +144,6 @@ spec:
                                   minItems: 1
                                   type: array
                               type: object
-                          required:
-                          - moduleName
                           type: object
                       required:
                       - containerImage
@@ -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: |-
@@ -283,8 +283,6 @@ spec:
                                   minItems: 1
                                   type: array
                               type: object
-                          required:
-                          - moduleName
                           type: object
                       required:
                       - containerImage