Feat/k0s download airgapped bundle

NOTICE

@@ -199,7 +199,7 @@ License URL: https://github.com/beorn7/perks/blob/v1.0.1/LICENSE
 Module: github.com/blang/semver/v4
 Version: v4.0.0
 License: MIT
-License URL: https://github.com/blang/semver/blob/v4.0.0/v4/LICENSE
+License URL: https://github.com/blang/semver/blob/v4.0.0/LICENSE
 
 ----------
 Module: github.com/bmatcuk/doublestar/v4
@@ -397,7 +397,7 @@ License URL: https://github.com/emirpasic/gods/blob/v1.18.1/LICENSE
 Module: github.com/evanphx/json-patch/v5
 Version: v5.9.11
 License: BSD-3-Clause
-License URL: https://github.com/evanphx/json-patch/blob/v5.9.11/v5/LICENSE
+License URL: https://github.com/evanphx/json-patch/blob/v5.9.11/LICENSE
 
 ----------
 Module: github.com/exponent-io/jsonpath
@@ -721,7 +721,7 @@ License URL: https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.
 Module: github.com/googleapis/gax-go/v2
 Version: v2.26.2
 License: BSD-3-Clause
-License URL: https://github.com/googleapis/gax-go/blob/v2.26.2/v2/LICENSE
+License URL: https://github.com/googleapis/gax-go/blob/v2.26.2/LICENSE
 
 ----------
 Module: github.com/gorilla/websocket
@@ -1507,7 +1507,7 @@ License URL: https://cs.opensource.google/go/x/time/+/v0.16.0:LICENSE
 Module: gomodules.xyz/jsonpatch/v2
 Version: v2.5.0
 License: Apache-2.0
-License URL: https://github.com/gomodules/jsonpatch/blob/v2.5.0/v2/LICENSE
+License URL: https://github.com/gomodules/jsonpatch/blob/v2.5.0/LICENSE
 
 ----------
 Module: google.golang.org/api

cli/cmd/bootstrap_gcp.go

@@ -97,6 +97,7 @@ func AddBootstrapGcpCmd(parent *cobra.Command, opts *util.GlobalOptions) {
 	flags.StringVar(&bootstrapGcpCmd.CodesphereEnv.DNSZoneName, "dns-zone-name", "oms-testing", "Cloud DNS Zone Name (optional)")
 	flags.BoolVar(&bootstrapGcpCmd.CodesphereEnv.Preemptible, "preemptible", false, "Use preemptible VMs for Codesphere infrastructure. Mutually exclusive with --spot-vms (default: false)")
 	flags.BoolVar(&bootstrapGcpCmd.CodesphereEnv.SpotVMs, "spot-vms", false, "Use Spot VMs for Codesphere infrastructure. Falls back to standard VMs if spot capacity unavailable. Mutually exclusive with --preemptible (default: false)")
+	flags.BoolVar(&bootstrapGcpCmd.CodesphereEnv.Airgapped, "airgapped", false, "Install k0s from the k0s airgap image bundle, so the cluster nodes pull no k0s images from the internet (default: false)")
 	flags.Int64Var(&bootstrapGcpCmd.CodesphereEnv.RootDiskSize, "root-disk-size", 50, "Instance root disk size in GB (default: 50)")
 
 	flags.BoolVar(&bootstrapGcpCmd.CodesphereEnv.WriteConfig, "write-config", true, "Write generated install config to file (default: true)")

cli/cmd/k0s/download_k0s.go

@@ -29,19 +29,15 @@ type DownloadK0sOpts struct {
 	*util.GlobalOptions
 	Version string
 	Force   bool
+	Airgap  bool
 }
 
 func (c *DownloadK0sCmd) RunE(_ *cobra.Command, args []string) error {
 	hw := portal.NewHttpWrapper()
 	env := c.Env
 	k0s := installer.NewK0s(hw, env, c.FileWriter)
 
-	err := c.DownloadK0s(k0s)
-	if err != nil {
-		return fmt.Errorf("failed to download k0s: %w", err)
-	}
-
-	return nil
+	return c.DownloadK0s(k0s)
 }
 
 func AddDownloadCmd(download *cobra.Command, opts *util.GlobalOptions) {
@@ -55,6 +51,7 @@ func AddDownloadCmd(download *cobra.Command, opts *util.GlobalOptions) {
 				{Cmd: "", Desc: "Download k0s using the Go-native implementation"},
 				{Cmd: "--version 1.22.0", Desc: "Download a specific version of k0s"},
 				{Cmd: "--force", Desc: "Force download even if k0s binary exists"},
+				{Cmd: "--airgapped", Desc: "Also download the airgap image bundle for that version"},
 			}),
 		},
 		Opts:       DownloadK0sOpts{GlobalOptions: opts},
@@ -63,28 +60,36 @@ func AddDownloadCmd(download *cobra.Command, opts *util.GlobalOptions) {
 	}
 	k0s.cmd.Flags().StringVarP(&k0s.Opts.Version, "version", "v", "", "Version of k0s to download")
 	k0s.cmd.Flags().BoolVarP(&k0s.Opts.Force, "force", "f", false, "Force download even if k0s binary exists")
+	k0s.cmd.Flags().BoolVarP(&k0s.Opts.Airgap, "airgapped", "a", false, "Downloads the airgapped bundle for that version")
 
 	util.AddCmd(download, k0s.cmd)
 
 	k0s.cmd.RunE = k0s.RunE
 }
 
 func (c *DownloadK0sCmd) DownloadK0s(k0s installer.K0sManager) error {
-	version := c.Opts.Version
-	var err error
-	if version == "" {
-		version, err = k0s.GetLatestVersion()
-		if err != nil {
-			return fmt.Errorf("failed to get latest k0s version: %w", err)
-		}
+	version, err := resolveK0sVersion(k0s, c.Opts.Version)
+	if err != nil {
+		return err
 	}
 
-	k0sPath, err := k0s.Download(version, c.Opts.Force, !c.Opts.Verbose)
+	opts := installer.DownloadOptions{Force: c.Opts.Force, Quiet: !c.Opts.Verbose}
+
+	k0sPath, err := k0s.Download(version, opts)
 	if err != nil {
 		return fmt.Errorf("failed to download k0s: %w", err)
 	}
 
-	log.Printf("k0s binary downloaded successfully at '%s'", k0sPath)
+	if c.Opts.Airgap {
+		bundlePath, err := k0s.EnsureAirgapBundle(version, opts)
+		if err != nil {
+			return fmt.Errorf("failed to download k0s airgap bundle: %w", err)
+		}
+
+		log.Printf("k0s airgap bundle downloaded to '%s'", bundlePath)
+	}
+
+	log.Printf("k0s binary downloaded successfully to '%s'", k0sPath)
 
 	return nil
 }

cli/cmd/k0s/download_k0s_test.go

@@ -8,6 +8,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/spf13/cobra"
 
 	"github.com/codesphere-cloud/oms/cli/cmd/k0s"
 	"github.com/codesphere-cloud/oms/cli/cmd/util"
@@ -23,11 +24,13 @@ var _ = Describe("DownloadK0sk0s", func() {
 		globalOpts     *util.GlobalOptions
 		mockEnv        *env.MockEnv
 		mockFileWriter *intutil.MockFileIO
+		mockK0sManager *installer.MockK0sManager
 	)
 
 	BeforeEach(func() {
 		mockEnv = env.NewMockEnv(GinkgoT())
 		mockFileWriter = intutil.NewMockFileIO(GinkgoT())
+		mockK0sManager = installer.NewMockK0sManager(GinkgoT())
 		globalOpts = &util.GlobalOptions{}
 		opts = &k0s.DownloadK0sOpts{
 			GlobalOptions: globalOpts,
@@ -48,9 +51,8 @@ var _ = Describe("DownloadK0sk0s", func() {
 
 	Context("DownloadK0s method", func() {
 		It("fails when k0s manager fails to get latest version", func() {
-			mockK0sManager := installer.NewMockK0sManager(GinkgoT())
-
 			c.Opts.Version = "" // Test auto-version detection
+
 			mockK0sManager.EXPECT().GetLatestVersion().Return("", errors.New("network error"))
 
 			err := c.DownloadK0s(mockK0sManager)
@@ -60,11 +62,9 @@ var _ = Describe("DownloadK0sk0s", func() {
 		})
 
 		It("fails when k0s manager fails to download", func() {
-			mockK0sManager := installer.NewMockK0sManager(GinkgoT())
-
 			c.Opts.Version = "v1.29.1+k0s.0"
 
-			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", false, true).Return("", errors.New("download failed"))
+			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", installer.DownloadOptions{Quiet: true}).Return("", errors.New("download failed"))
 
 			err := c.DownloadK0s(mockK0sManager)
 			Expect(err).To(HaveOccurred())
@@ -73,27 +73,65 @@ var _ = Describe("DownloadK0sk0s", func() {
 		})
 
 		It("succeeds when version is specified and download works", func() {
-			mockK0sManager := installer.NewMockK0sManager(GinkgoT())
+			c.Opts.Version = "v1.29.1+k0s.0"
 
+			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", installer.DownloadOptions{Quiet: true}).Return("/test/workdir/k0s", nil)
+
+			err := c.DownloadK0s(mockK0sManager)
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("requests the airgap bundle when --airgapped is set", func() {
 			c.Opts.Version = "v1.29.1+k0s.0"
+			c.Opts.Airgap = true
 
-			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", false, true).Return("/test/workdir/k0s", nil)
+			opts := installer.DownloadOptions{Quiet: true}
+			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", opts).Return("/test/workdir/k0s", nil)
+			mockK0sManager.EXPECT().EnsureAirgapBundle("v1.29.1+k0s.0", opts).Return("/cache/k0s-airgap-bundle-amd64", nil)
 
 			err := c.DownloadK0s(mockK0sManager)
 			Expect(err).ToNot(HaveOccurred())
 		})
 
-		It("succeeds when version is auto-detected and download works", func() {
-			mockK0sManager := installer.NewMockK0sManager(GinkgoT())
+		It("reports airgap bundle download failures", func() {
+			c.Opts.Version = "v1.29.1+k0s.0"
+			c.Opts.Airgap = true
+
+			opts := installer.DownloadOptions{Quiet: true}
+			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", opts).Return("/test/workdir/k0s", nil)
+			mockK0sManager.EXPECT().EnsureAirgapBundle("v1.29.1+k0s.0", opts).Return("", errors.New("network error"))
 
+			err := c.DownloadK0s(mockK0sManager)
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring("failed to download k0s airgap bundle"))
+			Expect(err.Error()).To(ContainSubstring("network error"))
+		})
+
+		It("succeeds when version is auto-detected and download works", func() {
 			c.Opts.Version = "" // Test auto-version detection
 			c.Opts.Force = true
 			c.Opts.Verbose = true
+
 			mockK0sManager.EXPECT().GetLatestVersion().Return("v1.29.1+k0s.0", nil)
-			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", true, false).Return("/test/workdir/k0s", nil)
+			mockK0sManager.EXPECT().Download("v1.29.1+k0s.0", installer.DownloadOptions{Force: true, Quiet: false}).Return("/test/workdir/k0s", nil)
 
 			err := c.DownloadK0s(mockK0sManager)
 			Expect(err).ToNot(HaveOccurred())
 		})
 	})
+
+	Context("AddDownloadCmd", func() {
+		It("registers --airgapped with the -a shorthand and default false", func() {
+			download := &cobra.Command{Use: "download"}
+
+			k0s.AddDownloadCmd(download, &util.GlobalOptions{})
+
+			Expect(download.Commands()).To(HaveLen(1))
+
+			flag := download.Commands()[0].Flags().Lookup("airgapped")
+			Expect(flag).ToNot(BeNil())
+			Expect(flag.Shorthand).To(Equal("a"))
+			Expect(flag.DefValue).To(Equal("false"))
+		})
+	})
 })