Use WorkerPool ProviderConfig for Ignition and ServeLabels

ironcore-dev · Nov 5, 2024 · 45c1692 · 45c1692
1 parent 9c0728a
commit 45c1692
Show file tree

Hide file tree

Showing 18 changed files with 176 additions and 379 deletions.
diff --git a/example/30-infrastructure.yaml b/example/30-infrastructure.yaml
@@ -51,8 +51,3 @@ spec:
   providerConfig:
     apiVersion: metal.provider.extensions.gardener.cloud/v1alpha1
     kind: InfrastructureConfig
-    worker:
-      WORKER_POOL_NAME:
-        extraIgnition:
-          raw: "the-ignition"
-          # override: true
diff --git a/example/30-worker.yaml b/example/30-worker.yaml
@@ -93,3 +93,11 @@ spec:
     zones:
     - my-machine-pool-a
     - my-machine-pool-b
+    providerConfig:
+      apiVersion: metal.provider.extensions.gardener.cloud/v1alpha1
+      kind: WorkerConfig
+      extraIgnition:
+        raw: "the-ignition"
+        # override: true
+      serverLabels:
+        foo: bar
diff --git a/hack/api-reference/api.md b/hack/api-reference/api.md
@@ -13,8 +13,6 @@ Resource Types:
 <a href="#metal.provider.extensions.gardener.cloud/v1alpha1.CloudProfileConfig">CloudProfileConfig</a>
 </li><li>
 <a href="#metal.provider.extensions.gardener.cloud/v1alpha1.ControlPlaneConfig">ControlPlaneConfig</a>
-</li><li>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.IgnitionConfig">IgnitionConfig</a>
 </li></ul>
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.CloudProfileConfig">CloudProfileConfig
 </h3>
@@ -74,18 +72,6 @@ logical names and versions to provider-specific identifiers.</p>
 <p>RegionConfigs is the list of supported regions.</p>
 </td>
 </tr>
-<tr>
-<td>
-<code>machineTypes</code></br>
-<em>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.MachineType">
-[]MachineType
-</a>
-</em>
-</td>
-<td>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.ControlPlaneConfig">ControlPlaneConfig
@@ -148,67 +134,6 @@ LoadBalancerConfig
 </tr>
 </tbody>
 </table>
-<h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.IgnitionConfig">IgnitionConfig
-</h3>
-<p>
-(<em>Appears on:</em>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.WorkerConfig">WorkerConfig</a>)
-</p>
-<p>
-<p>IgnitionConfig contains ignition settings.</p>
-</p>
-<table>
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>apiVersion</code></br>
-string</td>
-<td>
-<code>
-metal.provider.extensions.gardener.cloud/v1alpha1
-</code>
-</td>
-</tr>
-<tr>
-<td>
-<code>kind</code></br>
-string
-</td>
-<td><code>IgnitionConfig</code></td>
-</tr>
-<tr>
-<td>
-<code>raw</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Raw contains an inline ignition config, which is merged with the config from the os extension.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>override</code></br>
-<em>
-bool
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Override configures, if ignition keys set by the os-extension are overridden
-by extra ignition.</p>
-</td>
-</tr>
-</tbody>
-</table>
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.BgpPeer">BgpPeer
 </h3>
 <p>
@@ -373,10 +298,14 @@ map[string]bool
 </tr>
 </tbody>
 </table>
-<h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.InfrastructureConfig">InfrastructureConfig
+<h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.IgnitionConfig">IgnitionConfig
 </h3>
 <p>
-<p>InfrastructureConfig infrastructure configuration resource</p>
+(<em>Appears on:</em>
+<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.WorkerConfig">WorkerConfig</a>)
+</p>
+<p>
+<p>IgnitionConfig contains ignition settings.</p>
 </p>
 <table>
 <thead>
@@ -388,20 +317,46 @@ map[string]bool
 <tbody>
 <tr>
 <td>
-<code>worker</code></br>
+<code>raw</code></br>
 <em>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.WorkerConfig">
-map[string]./pkg/apis/metal/v1alpha1.WorkerConfig
-</a>
+string
 </em>
 </td>
 <td>
 <em>(Optional)</em>
-<p>Worker contains settings per worker pool specific to the metal-operator</p>
+<p>Raw contains an inline ignition config, which is merged with the config from the os extension.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>override</code></br>
+<em>
+bool
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Override configures, if ignition keys set by the os-extension are overridden
+by extra ignition.</p>
 </td>
 </tr>
 </tbody>
 </table>
+<h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.InfrastructureConfig">InfrastructureConfig
+</h3>
+<p>
+<p>InfrastructureConfig infrastructure configuration resource</p>
+</p>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+</tbody>
+</table>
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.InfrastructureStatus">InfrastructureStatus
 </h3>
 <p>
@@ -624,44 +579,6 @@ string
 </tr>
 </tbody>
 </table>
-<h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.MachineType">MachineType
-</h3>
-<p>
-(<em>Appears on:</em>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.CloudProfileConfig">CloudProfileConfig</a>)
-</p>
-<p>
-</p>
-<table>
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>name</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<code>serverLabels</code></br>
-<em>
-map[string]string
-</em>
-</td>
-<td>
-</td>
-</tr>
-</tbody>
-</table>
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.MetallbConfig">MetallbConfig
 </h3>
 <p>
@@ -772,11 +689,7 @@ string
 <h3 id="metal.provider.extensions.gardener.cloud/v1alpha1.WorkerConfig">WorkerConfig
 </h3>
 <p>
-(<em>Appears on:</em>
-<a href="#metal.provider.extensions.gardener.cloud/v1alpha1.InfrastructureConfig">InfrastructureConfig</a>)
-</p>
-<p>
-<p>WorkerConfig contains settings per pool, which are specific to the metal-operator.</p>
+<p>WorkerConfig contains configuration settings for the worker nodes.</p>
 </p>
 <table>
 <thead>
@@ -797,7 +710,19 @@ IgnitionConfig
 </td>
 <td>
 <em>(Optional)</em>
-<p>ExtraIgnition contains additional ignition configuration.</p>
+<p>ExtraIgnition contains additional Ignition for Worker nodes.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>serverLabels</code></br>
+<em>
+map[string]string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>ServerLabels is a map of labels that are applied to the ServerClaim for Server selection.</p>
 </td>
 </tr>
 </tbody>

diff --git a/pkg/apis/metal/register.go b/pkg/apis/metal/register.go
@@ -38,6 +38,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&InfrastructureConfig{},
 		&InfrastructureStatus{},
 		&ControlPlaneConfig{},
+		&WorkerConfig{},
 		&WorkerStatus{},
 	)
 	return nil

diff --git a/pkg/apis/metal/types_cloudprofile.go b/pkg/apis/metal/types_cloudprofile.go
@@ -19,12 +19,6 @@ type CloudProfileConfig struct {
 	MachineImages []MachineImages
 	// RegionConfigs is the list of supported regions.
 	RegionConfigs []RegionConfig
-	MachineTypes  []MachineType
-}
-
-type MachineType struct {
-	Name         string
-	ServerLabels map[string]string
 }
 
 // MachineImages is a mapping from logical names and versions to provider-specific identifiers.

diff --git a/pkg/apis/metal/types_infrastructure.go b/pkg/apis/metal/types_infrastructure.go
@@ -8,24 +8,11 @@ import (
 )
 
 // +genclient
-
-// IgnitionConfig contains ignition settings.
-type IgnitionConfig struct {
-	Raw      string
-	Override bool
-}
-
-// WorkerConfig contains settings per pool, which are specific to the metal-operator.
-type WorkerConfig struct {
-	ExtraIgnition *IgnitionConfig
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // InfrastructureConfig infrastructure configuration resource
 type InfrastructureConfig struct {
 	metav1.TypeMeta
-	Worker map[string]WorkerConfig
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/metal/types_worker.go b/pkg/apis/metal/types_worker.go
@@ -10,6 +10,17 @@ import (
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
+// WorkerConfig contains configuration settings for the worker nodes.
+type WorkerConfig struct {
+	metav1.TypeMeta
+	// ExtraIgnition contains additional Ignition for Worker nodes.
+	ExtraIgnition *IgnitionConfig
+	// ServerLabels is a map of labels that are applied to the ServerClaim for Server selection.
+	ServerLabels map[string]string
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
 // WorkerStatus contains information about created worker resources.
 type WorkerStatus struct {
 	metav1.TypeMeta
@@ -33,3 +44,9 @@ type MachineImage struct {
 	// Architecture is the CPU architecture of the machine image.
 	Architecture *string
 }
+
+// IgnitionConfig contains ignition settings.
+type IgnitionConfig struct {
+	Raw      string
+	Override bool
+}
diff --git a/pkg/apis/metal/v1alpha1/register.go b/pkg/apis/metal/v1alpha1/register.go
@@ -32,6 +32,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&InfrastructureConfig{},
 		&InfrastructureStatus{},
 		&ControlPlaneConfig{},
+		&WorkerConfig{},
 		&WorkerStatus{},
 	)
 	return nil

diff --git a/pkg/apis/metal/v1alpha1/types_cloudprofile.go b/pkg/apis/metal/v1alpha1/types_cloudprofile.go
@@ -19,12 +19,6 @@ type CloudProfileConfig struct {
 	MachineImages []MachineImages `json:"machineImages"`
 	// RegionConfigs is the list of supported regions.
 	RegionConfigs []RegionConfig `json:"regionConfigs,omitempty"`
-	MachineTypes  []MachineType  `json:"machineTypes,omitempty"`
-}
-
-type MachineType struct {
-	Name         string            `json:"name"`
-	ServerLabels map[string]string `json:"serverLabels,omitempty"`
 }
 
 // MachineImages is a mapping from logical names and versions to provider-specific identifiers.

diff --git a/pkg/apis/metal/v1alpha1/types_infrastructure.go b/pkg/apis/metal/v1alpha1/types_infrastructure.go
@@ -9,34 +9,11 @@ import (
 
 // +genclient
 
-// IgnitionConfig contains ignition settings.
-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 are overridden
-	// by extra ignition.
-	// +optional
-	Override bool `json:"override,omitempty"`
-}
-
-// WorkerConfig contains settings per pool, which are specific to the metal-operator.
-type WorkerConfig struct {
-	// ExtraIgnition contains additional ignition configuration.
-	// +optional
-	ExtraIgnition *IgnitionConfig `json:"extraIgnition,omitempty"`
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // InfrastructureConfig infrastructure configuration resource
 type InfrastructureConfig struct {
 	metav1.TypeMeta `json:",inline"`
-
-	// Worker contains settings per worker pool specific to the metal-operator
-	// +optional
-	Worker map[string]WorkerConfig `json:"worker,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object