Add override field to extraIgnition config on worker pools

example/30-infrastructure.yaml

@@ -51,5 +51,8 @@ spec:
   providerConfig:
     apiVersion: metal.provider.extensions.gardener.cloud/v1alpha1
     kind: InfrastructureConfig
-    #networkRef: # (optional)
-    #  name: my-network
+    worker:
+      WORKER_POOL_NAME:
+        extraIgnition:
+          raw: "the-ignition"
+          # override: true

pkg/apis/metal/types_infrastructure.go

@@ -11,7 +11,8 @@ import (
 
 // IgnitionConfig contains ignition settings.
 type IgnitionConfig struct {
-	Raw string
+	Raw      string
+	Override bool
 }
 
 // WorkerConfig contains settings per pool, which are specific to the metal-operator.

pkg/apis/metal/v1alpha1/types_infrastructure.go

@@ -14,6 +14,11 @@ type IgnitionConfig struct {
 	// Raw contains an inline ignition config, which is merged with the config from the os extension.
 	// +optional
 	Raw string `json:"raw,omitempty"`
+
+	// Override configures, if ignition keys set by the os-extension can be merged
+	// with extra ignition.
+	// +optional
+	Override bool `json:"override,omitempty"`
 }
 
 // WorkerConfig contains settings per pool, which are specific to the metal-operator.

pkg/controller/worker/machines.go

@@ -119,6 +119,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets() ([]*machinecontrollerv
 		metalConfig, ok := infrastructureConfig.Worker[pool.Name]
 		if ok && metalConfig.ExtraIgnition != nil {
 			machineClassProviderSpec[metal.IgnitionFieldName] = metalConfig.ExtraIgnition.Raw
+			machineClassProviderSpec[metal.IgnitionOverrideFieldName] = metalConfig.ExtraIgnition.Override
 		}
 
 		for zoneIndex, zone := range pool.Zones {

pkg/controller/worker/machines_test.go

@@ -114,7 +114,8 @@ var _ = Describe("Machines", func() {
 				Worker: map[string]metalv1alpha1.WorkerConfig{
 					pool.Name: {
 						ExtraIgnition: &metalv1alpha1.IgnitionConfig{
-							Raw: "abc",
+							Raw:      "abc",
+							Override: true,
 						},
 					},
 				},
@@ -133,7 +134,8 @@ var _ = Describe("Machines", func() {
 				metal.ServerLabelsFieldName: map[string]string{
 					"foo": "bar",
 				},
-				metal.IgnitionFieldName: "abc",
+				metal.IgnitionFieldName:         "abc",
+				metal.IgnitionOverrideFieldName: true,
 			}
 
 			Eventually(Object(machineClass)).Should(SatisfyAll(

pkg/metal/types.go

@@ -40,8 +40,10 @@ const (
 	ImageFieldName = "image"
 	// ServerLabelsFieldName is the name of the server labels field
 	ServerLabelsFieldName = "serverLabels"
-	// ExtraIgnition is the name of the ignition field
+	// IgnitionFieldName is the name of the ignition field
 	IgnitionFieldName = "ignition"
+	// IgnitionOverrideFieldName is the name of the ignitionOverride field
+	IgnitionOverrideFieldName = "ignitionOverride"
 	// ClusterNameLabel is the name is the label key of the cluster name
 	ClusterNameLabel = "extension.metal.dev/cluster-name"