... create uefi via templates, not automatically via code.

syself · Mar 1, 2024 · ca74781 · ca74781
1 parent 8ef74a9
commit ca74781
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/pkg/services/baremetal/host/utils.go b/pkg/services/baremetal/host/utils.go
@@ -48,11 +48,7 @@ SWRAID %v`, autoSetupInput.hostName, installImageSpec.Swraid)
 SWRAIDLEVEL %v`, hostName, installImageSpec.SwraidLevel)
 	}
 
-	// We always create the UEFI partition, even for legacy BIOS.
-	// This makes the setup easier, if the partition table type should
-	// get changed later.
-	partitions := "PART /boot/efi esp 512\n"
-
+	var partitions string
 	for _, partition := range installImageSpec.Partitions {
 		partitions = fmt.Sprintf(`%s
 PART %s %s %s`, partitions, partition.Mount, partition.FileSystem, partition.Size)

diff --git a/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml b/templates/cluster-templates/bases/hetznerbaremetal-mt-control-plane-ubuntu.yaml
@@ -9,6 +9,9 @@ spec:
         image:
           path: /root/.oldroot/nfs/install/../images/Ubuntu-2004-focal-64-minimal-hwe.tar.gz
         partitions:
+          - fileSystem: esp
+            mount: /boot/efi
+            size: 512M
           - mount: /boot
             fileSystem: ext4
             size: 1024M

diff --git a/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml b/templates/cluster-templates/bases/hetznerbaremetal-mt-md-1-ubuntu.yaml
@@ -9,6 +9,9 @@ spec:
         image:
           path: /root/.oldroot/nfs/install/../images/Ubuntu-2004-focal-64-minimal-hwe.tar.gz
         partitions:
+          - fileSystem: esp
+            mount: /boot/efi
+            size: 512M
           - mount: /boot
             fileSystem: ext4
             size: 1024M

diff --git a/templates/cluster-templates/cluster-class.yaml b/templates/cluster-templates/cluster-class.yaml
@@ -681,6 +681,9 @@ spec:
         image:
           path: /root/.oldroot/nfs/install/../images/Ubuntu-2004-focal-64-minimal-hwe.tar.gz
         partitions:
+          - fileSystem: esp
+            mount: /boot/efi
+            size: 512M
           - fileSystem: ext4
             mount: /boot
             size: 1024M