Add disable-boot-entry flag to reset command

Signed-off-by: Fredrik Lönnegren <[email protected]>
rancher · Dec 14, 2023 · dcf8409 · dcf8409
1 parent 4f00fe4
commit dcf8409
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/.obs/chartfile/crds/templates/crds.yaml b/.obs/chartfile/crds/templates/crds.yaml
@@ -743,6 +743,8 @@ spec:
                             type: array
                           debug:
                             type: boolean
+                          disable-boot-entry:
+                            type: boolean
                           enabled:
                             type: boolean
                           poweroff:

diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -71,6 +71,8 @@ type Reset struct {
 	// +optional
 	// +kubebuilder:default:=true
 	Reboot bool `json:"reboot,omitempty" yaml:"reboot,omitempty" mapstructure:"reboot"`
+	// +optional
+	DisableBootEntry bool `json:"disable-boot-entry,omitempty" yaml:"disable-boot-entry,omitempty"`
 }
 
 type Registration struct {

diff --git a/cmd/register/main_test.go b/cmd/register/main_test.go
@@ -25,15 +25,16 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	elementalv1 "github.com/rancher/elemental-operator/api/v1beta1"
-	imocks "github.com/rancher/elemental-operator/pkg/install/mocks"
-	"github.com/rancher/elemental-operator/pkg/register"
-	rmocks "github.com/rancher/elemental-operator/pkg/register/mocks"
 	"github.com/spf13/cobra"
 	"github.com/twpayne/go-vfs"
 	"github.com/twpayne/go-vfs/vfst"
 	"go.uber.org/mock/gomock"
 	"gopkg.in/yaml.v3"
+
+	elementalv1 "github.com/rancher/elemental-operator/api/v1beta1"
+	imocks "github.com/rancher/elemental-operator/pkg/install/mocks"
+	"github.com/rancher/elemental-operator/pkg/register"
+	rmocks "github.com/rancher/elemental-operator/pkg/register/mocks"
 )
 
 func TestRegister(t *testing.T) {
@@ -93,13 +94,14 @@ var (
 				ConfigDir:        "a test config dir",
 			},
 			Reset: elementalv1.Reset{
-				Enabled:         true,
-				ResetPersistent: false,
-				ResetOEM:        false,
-				ConfigURLs:      []string{"foo", "bar"},
-				SystemURI:       "a system uri",
-				PowerOff:        true,
-				Reboot:          true,
+				Enabled:          true,
+				ResetPersistent:  false,
+				ResetOEM:         false,
+				ConfigURLs:       []string{"foo", "bar"},
+				SystemURI:        "a system uri",
+				PowerOff:         true,
+				Reboot:           true,
+				DisableBootEntry: true,
 			},
 		},
 	}

diff --git a/config/crd/bases/elemental.cattle.io_machineregistrations.yaml b/config/crd/bases/elemental.cattle.io_machineregistrations.yaml
@@ -127,6 +127,8 @@ spec:
                             type: array
                           debug:
                             type: boolean
+                          disable-boot-entry:
+                            type: boolean
                           enabled:
                             type: boolean
                           poweroff:

diff --git a/pkg/elementalcli/elementalcli.go b/pkg/elementalcli/elementalcli.go
@@ -109,6 +109,7 @@ func mapToResetEnv(conf elementalv1.Reset) []string {
 	variables = append(variables, formatEV("ELEMENTAL_RESET_SYSTEM", conf.SystemURI))
 	variables = append(variables, formatEV("ELEMENTAL_RESET_PERSISTENT", strconv.FormatBool(conf.ResetOEM)))
 	variables = append(variables, formatEV("ELEMENTAL_RESET_OEM", strconv.FormatBool(conf.ResetPersistent)))
+	variables = append(variables, formatEV("ELEMENTAL_RESET_DISABLE_BOOT_ENTRY", strconv.FormatBool(conf.DisableBootEntry)))
 	// See GetRunKeyEnvMap() in https://github.com/rancher/elemental-toolkit/blob/main/pkg/constants/constants.go
 	variables = append(variables, formatEV("ELEMENTAL_POWEROFF", strconv.FormatBool(conf.PowerOff)))
 	variables = append(variables, formatEV("ELEMENTAL_REBOOT", strconv.FormatBool(conf.Reboot)))