chore: extract pkg/imager/quirks to pkg/machinery

To make it possible to use it without pulling the whole Talos. Signed-off-by: Artem Chernyshev <[email protected]> (cherry picked from commit 3dd1f4e)
siderolabs · May 17, 2024 · a91527e · a91527e
1 parent 5e15444
commit a91527e
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/cmd/installer/pkg/install/manifest.go b/cmd/installer/pkg/install/manifest.go
@@ -22,8 +22,8 @@ import (
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/board"
 	"github.com/siderolabs/talos/internal/pkg/mount"
 	"github.com/siderolabs/talos/internal/pkg/partition"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
 // Manifest represents the instructions for preparing all block devices

diff --git a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/bootloader.go b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/bootloader.go
@@ -12,7 +12,7 @@ import (
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub"
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/options"
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/sdboot"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
 // Bootloader describes a bootloader.

diff --git a/pkg/imager/imager.go b/pkg/imager/imager.go
@@ -24,10 +24,10 @@ import (
 	"github.com/siderolabs/talos/pkg/imager/extensions"
 	"github.com/siderolabs/talos/pkg/imager/overlay/executor"
 	"github.com/siderolabs/talos/pkg/imager/profile"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
 	"github.com/siderolabs/talos/pkg/imager/utils"
 	"github.com/siderolabs/talos/pkg/machinery/config/merge"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 	"github.com/siderolabs/talos/pkg/machinery/kernel"
 	"github.com/siderolabs/talos/pkg/machinery/overlay"
 	"github.com/siderolabs/talos/pkg/machinery/version"

diff --git a/pkg/imager/iso/grub.go b/pkg/imager/iso/grub.go
@@ -16,8 +16,8 @@ import (
 	"github.com/siderolabs/go-cmd/pkg/cmd"
 
 	"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
 	"github.com/siderolabs/talos/pkg/imager/utils"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
 // GRUBOptions described the input for the CreateGRUB function.

diff --git a/pkg/imager/out.go b/pkg/imager/out.go
@@ -33,9 +33,9 @@ import (
 	"github.com/siderolabs/talos/pkg/imager/ova"
 	"github.com/siderolabs/talos/pkg/imager/profile"
 	"github.com/siderolabs/talos/pkg/imager/qemuimg"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
 	"github.com/siderolabs/talos/pkg/imager/utils"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 	"github.com/siderolabs/talos/pkg/reporter"
 )
 

diff --git a/pkg/imager/profile/input.go b/pkg/imager/profile/input.go
@@ -26,9 +26,9 @@ import (
 	"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/aws"
 	"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/azure"
 	"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/file"
-	"github.com/siderolabs/talos/pkg/imager/quirks"
 	"github.com/siderolabs/talos/pkg/images"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
 const (

diff --git a/pkg/imager/quirks/quirks.go → pkg/machinery/imager/quirks/quirks.go b/pkg/imager/quirks/quirks.go → pkg/machinery/imager/quirks/quirks.go
diff --git a/pkg/imager/quirks/quirks_test.go → pkg/machinery/imager/quirks/quirks_test.go b/pkg/imager/quirks/quirks_test.go → pkg/machinery/imager/quirks/quirks_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/siderolabs/talos/pkg/imager/quirks"
+	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
 func TestSupportsResetOption(t *testing.T) {