openshift: Properly filter unsupported grub config

config/common/errors.go

@@ -84,6 +84,7 @@ var (
 	ErrUserNameSupport          = errors.New("users other than \"core\" are not supported in this spec version")
 	ErrKernelArgumentSupport    = errors.New("this section cannot be used for kernel arguments in this spec version; use openshift.kernel_arguments instead")
 	ErrMissingKernelArgumentCex = errors.New("'rd.luks.key=/etc/luks/cex.key' must be set as kernel argument when CEX is enabled for the boot device")
+	ErrGrubConfigSupport        = errors.New("GRUB configuration is not supported in this version")
 
 	// Storage
 	ErrClevisSupport     = errors.New("clevis is not supported in this spec version")

config/openshift/v4_14/translate.go

@@ -16,9 +16,11 @@ package v4_14
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_5"
 	"github.com/coreos/butane/config/openshift/v4_14/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_14Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{

config/openshift/v4_15/translate.go

@@ -16,9 +16,11 @@ package v4_15
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_5"
 	"github.com/coreos/butane/config/openshift/v4_15/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_15Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{

config/openshift/v4_16/translate.go

@@ -16,9 +16,11 @@ package v4_16
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_5"
 	"github.com/coreos/butane/config/openshift/v4_16/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_16Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{

config/openshift/v4_17/translate.go

@@ -16,9 +16,11 @@ package v4_17
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_5"
 	"github.com/coreos/butane/config/openshift/v4_17/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_17Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{

config/openshift/v4_18/translate.go

@@ -16,9 +16,11 @@ package v4_18
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_5"
 	"github.com/coreos/butane/config/openshift/v4_18/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_18Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{

config/openshift/v4_19/translate.go

@@ -16,9 +16,11 @@ package v4_19
 
 import (
 	"net/url"
+	"reflect"
 	"strings"
 
 	"github.com/coreos/butane/config/common"
+	fcos "github.com/coreos/butane/config/fcos/v1_6"
 	"github.com/coreos/butane/config/openshift/v4_19/result"
 	cutil "github.com/coreos/butane/config/util"
 	"github.com/coreos/butane/translate"
@@ -118,6 +120,12 @@ func (c Config) ToMachineConfig4_19Unvalidated(options common.TranslateOptions)
 		return result.MachineConfig{}, ts, r
 	}
 
+	// If any GRUB settings are provided by the user, return an error.
+	if !reflect.DeepEqual(c.Grub, fcos.Grub{}) {
+		r.AddOnError(path.New("yaml", "grub"), common.ErrGrubConfigSupport)
+		return result.MachineConfig{}, ts, r
+	}
+
 	// wrap
 	ts = ts.PrefixPaths(path.New("yaml"), path.New("json", "spec", "config"))
 	mc := result.MachineConfig{