From 20fe8ac04b4331f76c8736cfaa107668d4c17732 Mon Sep 17 00:00:00 2001 From: gaufde <108958455+gaufde@users.noreply.github.com> Date: Tue, 22 Oct 2024 23:39:16 -0700 Subject: [PATCH] Fix linting errors and add reference to newly created bug report #24344. Signed-off-by: Graceson Aufderheide --- pkg/machine/e2e/config_init_test.go | 2 +- pkg/machine/e2e/init_test.go | 4 ++-- pkg/machine/shim/host.go | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/machine/e2e/config_init_test.go b/pkg/machine/e2e/config_init_test.go index f5839d28fb..0423010477 100644 --- a/pkg/machine/e2e/config_init_test.go +++ b/pkg/machine/e2e/config_init_test.go @@ -91,7 +91,7 @@ func (i *initMachine) buildCmd(m *machineTestBuilder) []string { return } - // The exception below is required for testing custom ignition files. + // FIXME:#24344 work-around for custom ignition removal if strings.Contains(session.errorToString(), "failed to remove machines files: unable to find connection named") { return } diff --git a/pkg/machine/e2e/init_test.go b/pkg/machine/e2e/init_test.go index 5345b821cf..7b5e35e96a 100644 --- a/pkg/machine/e2e/init_test.go +++ b/pkg/machine/e2e/init_test.go @@ -250,7 +250,7 @@ var _ = Describe("podman machine init", func() { configDir := filepath.Join(testDir, ".config", "containers", "podman", "machine", testProvider.VMType().String()) - //test that all required machine files are created + // test that all required machine files are created fileExtensions := []string{".lock", ".json", ".ign"} for _, ext := range fileExtensions { filename := filepath.Join(configDir, fmt.Sprintf("%s%s", name, ext)) @@ -259,7 +259,7 @@ var _ = Describe("podman machine init", func() { Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("file %v does not exist", filename)) } - //enforce that the raw ignition is copied over verbatim + // enforce that the raw ignition is copied over verbatim createdIgn := filepath.Join(configDir, fmt.Sprintf("%s%s", name, ".ign")) contentWanted, err := os.ReadFile(tmpFile.Name()) Expect(err).ToNot(HaveOccurred()) diff --git a/pkg/machine/shim/host.go b/pkg/machine/shim/host.go index f8c8921555..9456683ece 100644 --- a/pkg/machine/shim/host.go +++ b/pkg/machine/shim/host.go @@ -201,7 +201,6 @@ func Init(opts machineDefine.InitOptions, mp vmconfigs.VMProvider) error { return err } } else { - err = ignBuilder.GenerateIgnitionConfig() if err != nil { return err