feat: deploy k0s install config #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

OliverTrautvetter wants to merge 79 commits into main from deploy_k0s_install-config

+2,714 −202

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,9 @@ all: build-cli build-service @@
     build-cli:
     	cd cli && go build -v && mv cli ../oms-cli
+    build-cli-linux:
+    	GOOS=linux GOARCH=amd64 go build -C cli -o ../oms-cli
     build-service:
     	cd service && go build -v && mv service ../oms-service
@@ Expand Down @@

cli/cmd/bootstrap_gcp.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -114,7 +114,7 @@ func (c *BootstrapGcpCmd) BootstrapGcp() error {
  
    		return fmt.Errorf("failed to bootstrap GCP: %w, env: %s", err, envString)

    	}

    	log.Println("\n🎉🎉🎉 GCP infrastructure bootstrapped successfully!")

    	log.Println("\nGCP infrastructure bootstrapped successfully!")

    	log.Println(envString)

    	log.Printf("Start the Codesphere installation using OMS from the jumpbox host:\nssh-add $SSH_KEY_PATH; ssh -o StrictHostKeyChecking=no -o ForwardAgent=yes -o SendEnv=OMS_PORTAL_API_KEY root@%s", bs.Env.Jumpbox.GetExternalIP())

    	log.Printf("When the installation is done, run the k0s configuration script generated at the k0s-1 host %s /root/configure-k0s.sh.", bs.Env.ControlPlaneNodes[0].GetInternalIP())

cli/cmd/install_k0s.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ package cmd @@
     import (
     	"fmt"
+    	"log"
+    	"path/filepath"
     	packageio "github.com/codesphere-cloud/cs-go/pkg/io"
     	"github.com/spf13/cobra"
@@ Expand All / @@ -25,24 +27,23 @@ type InstallK0sCmd struct { @@
     type InstallK0sOpts struct {
     	*GlobalOptions
-    	Version string
-    	Package string
-    	Config  string
-    	Force   bool
+    	Version       string
+    	K0sctlVersion string
+    	Package       string
+    	InstallConfig string
+    	SSHKeyPath    string
+    	Force         bool
+    	NoDownload    bool
     }
     func (c *InstallK0sCmd) RunE(_ *cobra.Command, args []string) error {
     	hw := portal.NewHttpWrapper()
     	env := c.Env
     	pm := installer.NewPackage(env.GetOmsWorkdir(), c.Opts.Package)
     	k0s := installer.NewK0s(hw, env, c.FileWriter)
+    	k0sctl := installer.NewK0sctl(hw, env, c.FileWriter)
-    	err := c.InstallK0s(pm, k0s)
-    	if err != nil {
-    		return fmt.Errorf("failed to install k0s: %w", err)
-    	}
-    	return nil
+    	return c.InstallK0s(pm, k0s, k0sctl)
     }
     func AddInstallK0sCmd(install *cobra.Command, opts *GlobalOptions) {
@@ Expand All @@
     			Use:   "k0s",
     			Short: "Install k0s Kubernetes distribution",
     			Long: packageio.Long(`Install k0s either from the package or by downloading it.
-    			This will either download the k0s binary directly to the OMS workdir, if not already present, and install it
-    			or load the k0s binary from the provided package file and install it.
-    			If no version is specified, the latest version will be downloaded.
-    			If no install config is provided, k0s will be installed with the '--single' flag.`),
+    			This command uses k0sctl to deploy k0s clusters from a Codesphere install-config.
+    			You must provide a Codesphere install-config file, which will:
+    			- Generate a k0s configuration from the install-config
+    			- Generate a k0sctl configuration for cluster deployment
+    			- Deploy k0s to all nodes defined in the install-config using k0sctl`),
     			Example: formatExamplesWithBinary("install k0s", []packageio.Example{
-    				{Cmd: "", Desc: "Install k0s using the Go-native implementation"},
-    				{Cmd: "--version <version>", Desc: "Version of k0s to install"},
+    				{Cmd: "--install-config <path>", Desc: "Path to Codesphere install-config file to generate k0s config from"},
+    				{Cmd: "--version <version>", Desc: "Version of k0s to install (e.g., v1.30.0+k0s.0)"},
+    				{Cmd: "--k0sctl-version <version>", Desc: "Version of k0sctl to use (e.g., v0.17.4)"},
     				{Cmd: "--package <file>", Desc: "Package file (e.g. codesphere-v1.2.3-installer.tar.gz) to load k0s from"},
-    				{Cmd: "--k0s-config <path>", Desc: "Path to k0s configuration file, if not set k0s will be installed with the '--single' flag"},
-    				{Cmd: "--force", Desc: "Force new download and installation even if k0s binary exists or is already installed"},
+    				{Cmd: "--ssh-key-path <path>", Desc: "SSH private key path for remote installation"},
+    				{Cmd: "--force", Desc: "Force new download and installation"},
+    				{Cmd: "--no-download", Desc: "Skip downloading k0s binary (expects it to be on remote nodes)"},
     			}, "oms-cli"),
     		},
     		Opts:       InstallK0sOpts{GlobalOptions: opts},
     		Env:        env.NewEnv(),
     		FileWriter: util.NewFilesystemWriter(),
     	}
     	k0s.cmd.Flags().StringVarP(&k0s.Opts.Version, "version", "v", "", "Version of k0s to install")
+    	k0s.cmd.Flags().StringVar(&k0s.Opts.K0sctlVersion, "k0sctl-version", "", "Version of k0sctl to use")
     	k0s.cmd.Flags().StringVarP(&k0s.Opts.Package, "package", "p", "", "Package file (e.g. codesphere-v1.2.3-installer.tar.gz) to load k0s from")
-    	k0s.cmd.Flags().StringVar(&k0s.Opts.Config, "k0s-config", "", "Path to k0s configuration file")
+    	k0s.cmd.Flags().StringVar(&k0s.Opts.InstallConfig, "install-config", "", "Path to Codesphere install-config file (required)")
+    	k0s.cmd.Flags().StringVar(&k0s.Opts.SSHKeyPath, "ssh-key-path", "", "SSH private key path for remote installation")
     	k0s.cmd.Flags().BoolVarP(&k0s.Opts.Force, "force", "f", false, "Force new download and installation")
+    	k0s.cmd.Flags().BoolVar(&k0s.Opts.NoDownload, "no-download", false, "Skip downloading k0s binary")
+    	_ = k0s.cmd.MarkFlagRequired("install-config")
     	install.AddCommand(k0s.cmd)
     	k0s.cmd.RunE = k0s.RunE
     }
-    const defaultK0sPath = "kubernetes/files/k0s"
+    const (
+    	defaultK0sPath   = "kubernetes/files/k0s"
+    	k0sctlConfigFile = "k0sctl-config.yaml"
+    )
-    func (c *InstallK0sCmd) InstallK0s(pm installer.PackageManager, k0s installer.K0sManager) error {
-    	// Default dependency path for k0s binary within package
-    	k0sPath := pm.GetDependencyPath(defaultK0sPath)
+    func (c *InstallK0sCmd) InstallK0s(pm installer.PackageManager, k0s installer.K0sManager, k0sctl installer.K0sctlManager) error {
+    	// Load install-config
+    	icg := installer.NewInstallConfigManager()
+    	if err := icg.LoadInstallConfigFromFile(c.Opts.InstallConfig); err != nil {
+    		return fmt.Errorf("failed to load install-config: %w", err)
+    	}
-    	var err error
-    	if c.Opts.Package == "" {
-    		k0sPath, err = k0s.Download(c.Opts.Version, c.Opts.Force, false)
+    	config := icg.GetInstallConfig()
+    	if !config.Kubernetes.ManagedByCodesphere {
+    		return fmt.Errorf("install-config specifies external Kubernetes, k0s installation is only supported for Codesphere-managed Kubernetes")
+    	}
+    	// Determine k0s version
+    	k0sVersion := c.Opts.Version
+    	if k0sVersion == "" {
+    		var err error
+    		k0sVersion, err = k0s.GetLatestVersion()
     		if err != nil {
-    			return fmt.Errorf("failed to download k0s: %w", err)
+    			return fmt.Errorf("failed to get latest k0s version: %w", err)
+    		}
+    		log.Printf("Using latest k0s version: %s", k0sVersion)
+    	}
+    	// Download or get k0s binary path
+    	var k0sBinaryPath string
+    	if !c.Opts.NoDownload {
+    		if c.Opts.Package != "" {
+    			// Extract the k0s binary from the package first
+    			if err := pm.ExtractDependency(defaultK0sPath, c.Opts.Force); err != nil {
+    				return fmt.Errorf("failed to extract k0s from package: %w", err)
+    			}
+    			k0sBinaryPath = pm.GetDependencyPath(defaultK0sPath)
+    		} else {
+    			var err error
+    			k0sBinaryPath, err = k0s.Download(k0sVersion, c.Opts.Force, false)
+    			if err != nil {
+    				return fmt.Errorf("failed to download k0s: %w", err)
+    			}
     		}
     	}
-    	err = k0s.Install(c.Opts.Config, k0sPath, c.Opts.Force)
+    	// Download k0sctl
+    	log.Println("Downloading k0sctl...")
+    	k0sctlPath, err := k0sctl.Download(c.Opts.K0sctlVersion, c.Opts.Force, false)
     	if err != nil {
-    		return fmt.Errorf("failed to install k0s: %w", err)
+    		return fmt.Errorf("failed to download k0sctl: %w", err)
     	}
+    	// Generate k0sctl configuration
+    	log.Println("Generating k0sctl configuration from install-config...")
+    	k0sctlConfig, err := installer.GenerateK0sctlConfig(config, k0sVersion, c.Opts.SSHKeyPath, k0sBinaryPath)
+    	if err != nil {
+    		return fmt.Errorf("failed to generate k0sctl config: %w", err)
+    	}
+    	// Write k0sctl config to file
+    	k0sctlConfigData, err := k0sctlConfig.Marshal()
+    	if err != nil {
+    		return fmt.Errorf("failed to marshal k0sctl config: %w", err)
+    	}
+    	k0sctlConfigPath := filepath.Join(c.Env.GetOmsWorkdir(), k0sctlConfigFile)
+    	if err := c.FileWriter.WriteFile(k0sctlConfigPath, k0sctlConfigData, 0644); err != nil {
+    		return fmt.Errorf("failed to write k0sctl config: %w", err)
+    	}
+    	log.Printf("Generated k0sctl configuration at %s", k0sctlConfigPath)
+    	// Apply k0sctl configuration
+    	log.Println("Applying k0sctl configuration to deploy k0s cluster...")
+    	if err := k0sctl.Apply(k0sctlConfigPath, k0sctlPath, c.Opts.Force); err != nil {
+    		return fmt.Errorf("failed to apply k0sctl config: %w", err)
+    	}
+    	log.Println("k0s cluster deployed successfully!")
+    	log.Printf("To manage your cluster, use: %s kubeconfig --config %s", k0sctlPath, k0sctlConfigPath)
     	return nil
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: deploy k0s install config #110

Diff view

Diff view

There are no files selected for viewing

Uh oh!

feat: deploy k0s install config #110

Are you sure you want to change the base?

feat: deploy k0s install config #110

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!