Set default spec.config.elemental.reset block for MachineRegistration

rancher · Aug 30, 2023 · 1e5d3e4 · 1e5d3e4
1 parent ce586ba
commit 1e5d3e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/api/v1beta1/seedimage_type.go b/api/v1beta1/seedimage_type.go
@@ -32,7 +32,7 @@ type SeedImageSpec struct {
 	// If when the lifetime elapses the built image is being downloaded, the active
 	// download will be completed before removing the built image.
 	// Default is 60 minutes, set to 0 to disable.
-	// +kubebuilder:default:=60
+	// +kubebuilder:default=60
 	// +optional
 	LifetimeMinutes int32 `json:"cleanupAfterMinutes"`
 	// RetriggerBuild triggers to build again a cleaned up seed image.

diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -102,6 +102,7 @@ type Elemental struct {
 	// +optional
 	Install Install `json:"install,omitempty" yaml:"install,omitempty"`
 	// +optional
+	// +kubebuilder:default:={"reset-persistent":true,"reset-oem":true,"reboot":true}
 	Reset Reset `json:"reset,omitempty" yaml:"reset,omitempty"`
 	// +optional
 	Registration Registration `json:"registration,omitempty" yaml:"registration,omitempty"`

diff --git a/charts/crds/templates/crds.yaml b/charts/crds/templates/crds.yaml
@@ -706,6 +706,10 @@ spec:
                             type: string
                         type: object
                       reset:
+                        default:
+                          reboot: true
+                          reset-oem: true
+                          reset-persistent: true
                         properties:
                           config-urls:
                             items:

diff --git a/config/crd/bases/elemental.cattle.io_machineregistrations.yaml b/config/crd/bases/elemental.cattle.io_machineregistrations.yaml
@@ -90,6 +90,10 @@ spec:
                             type: string
                         type: object
                       reset:
+                        default:
+                          reboot: true
+                          reset-oem: true
+                          reset-persistent: true
                         properties:
                           config-urls:
                             items: