Merge pull request #2046 from replicatedhq/embedded-cri

Kubelet and containerd (with runc)

.gitignore

@@ -27,4 +27,5 @@ supportbundle.tar.gz
 # for the embed experiment
 kubernetes/
 kots.db
-archives/
+archives/
+kotsdata/

cmd/kots/cli/run.go

@@ -100,8 +100,9 @@ func RunCmd() *cobra.Command {
 	if err != nil {
 		panic(err)
 	}
+	defaultDataDir := filepath.Join(cwd, "kotsdata")
 
-	cmd.Flags().String("data-dir", cwd, "directory to store admin console, kubernetes, and application data in")
+	cmd.Flags().String("data-dir", defaultDataDir, "directory to store admin console, kubernetes, and application data in")
 	cmd.Flags().String("shared-password", "", "the shared password to set to authenticate to the admin console")
 
 	return cmd

pkg/cluster/antrea.go

@@ -30,7 +30,7 @@ var antreaManifests string
 
 // note: https://github.com/antrea-io/antrea/releases/download/v0.13.5/antrea.yml
 
-func installAntrea(kubeconfigPath string) error {
+func installCNI(kubeconfigPath string) error {
 	config, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
 	if err != nil {
 		return errors.Wrap(err, "build config")

pkg/cluster/cluster.go

@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/kots/pkg/logger"
@@ -11,8 +12,7 @@ import (
 // This function blocks until the cluster control plane has started
 func Start(ctx context.Context, slug string, dataDir string) error {
 	log := ctx.Value("log").(*logger.CLILogger)
-	log.ActionWithSpinner("Starting cluster")
-	defer log.FinishSpinner()
+	log.ActionWithoutSpinner("Starting cluster")
 
 	// init tls and misc
 	// this function is synchronous and blocks until ready
@@ -43,9 +43,19 @@ func Start(ctx context.Context, slug string, dataDir string) error {
 		return errors.Wrap(err, "get kubeconfig path")
 	}
 
-	if err := installAntrea(kubeconfigPath); err != nil {
+	if err := installCNI(kubeconfigPath); err != nil {
 		return errors.Wrap(err, "install antrea")
 	}
 
+	fmt.Println("starting cri")
+	if err := startCRI(dataDir); err != nil {
+		return errors.Wrap(err, "install cri")
+	}
+
+	fmt.Println("starting kubelet")
+	if err := startKubelet(ctx, dataDir); err != nil {
+		return errors.Wrap(err, "install kubelet")
+	}
+
 	return nil
 }