fix: styles json (#1868)

* fix: styles json * chore: bump chart version * fix: codeblock prefix * remove dependence on docker sock * fix: import --------- Co-authored-by: John Dietz <[email protected]>
konstructio · Oct 24, 2023 · 155d030 · 155d030
1 parent 50226cc
commit 155d030
Show file tree

Hide file tree

Showing 11 changed files with 278 additions and 248 deletions.
diff --git a/cmd/aws/command.go b/cmd/aws/command.go
@@ -61,7 +61,7 @@ func Create() *cobra.Command {
 		Short:            "create the kubefirst platform running in aws",
 		TraverseChildren: true,
 		RunE:             createAws,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 	}
 
 	// todo review defaults and update descriptions
@@ -88,11 +88,11 @@ func Create() *cobra.Command {
 
 func Destroy() *cobra.Command {
 	destroyCmd := &cobra.Command{
-		Use:    "destroy",
-		Short:  "destroy the kubefirst platform",
-		Long:   "deletes the GitHub resources, aws resources, and local content to re-provision",
-		RunE:   common.Destroy,
-		PreRun: common.CheckDocker,
+		Use:   "destroy",
+		Short: "destroy the kubefirst platform",
+		Long:  "deletes the GitHub resources, aws resources, and local content to re-provision",
+		RunE:  common.Destroy,
+		// PreRun: common.CheckDocker,
 	}
 
 	return destroyCmd

diff --git a/cmd/civo/command.go b/cmd/civo/command.go
@@ -72,7 +72,7 @@ func Create() *cobra.Command {
 		Short:            "create the kubefirst platform running on civo kubernetes",
 		TraverseChildren: true,
 		RunE:             createCivo,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 	}
 
 	// todo review defaults and update descriptions
@@ -98,11 +98,11 @@ func Create() *cobra.Command {
 
 func Destroy() *cobra.Command {
 	destroyCmd := &cobra.Command{
-		Use:    "destroy",
-		Short:  "destroy the kubefirst platform",
-		Long:   "destroy the kubefirst platform running in civo and remove all resources",
-		RunE:   common.Destroy,
-		PreRun: common.CheckDocker,
+		Use:   "destroy",
+		Short: "destroy the kubefirst platform",
+		Long:  "destroy the kubefirst platform running in civo and remove all resources",
+		RunE:  common.Destroy,
+		// PreRun: common.CheckDocker,
 	}
 
 	return destroyCmd

diff --git a/cmd/digitalocean/command.go b/cmd/digitalocean/command.go
@@ -64,7 +64,7 @@ func Create() *cobra.Command {
 		Short:            "create the kubefirst platform running on DigitalOcean Kubernetes",
 		TraverseChildren: true,
 		RunE:             createDigitalocean,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 	}
 
 	// todo review defaults and update descriptions
@@ -90,11 +90,11 @@ func Create() *cobra.Command {
 
 func Destroy() *cobra.Command {
 	destroyCmd := &cobra.Command{
-		Use:    "destroy",
-		Short:  "destroy the kubefirst platform",
-		Long:   "destroy the kubefirst platform running in DigitalOcean and remove all resources",
-		RunE:   common.Destroy,
-		PreRun: common.CheckDocker,
+		Use:   "destroy",
+		Short: "destroy the kubefirst platform",
+		Long:  "destroy the kubefirst platform running in DigitalOcean and remove all resources",
+		RunE:  common.Destroy,
+		// PreRun: common.CheckDocker,
 	}
 
 	return destroyCmd

diff --git a/cmd/google/command.go b/cmd/google/command.go
@@ -67,7 +67,7 @@ func Create() *cobra.Command {
 		Short:            "create the kubefirst platform running on GCP kubernetes",
 		TraverseChildren: true,
 		RunE:             createGoogle,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 	}
 
 	// todo review defaults and update descriptions
@@ -95,11 +95,11 @@ func Create() *cobra.Command {
 
 func Destroy() *cobra.Command {
 	destroyCmd := &cobra.Command{
-		Use:    "destroy",
-		Short:  "destroy the kubefirst platform",
-		Long:   "destroy the kubefirst platform running in Goole and remove all resources",
-		RunE:   common.Destroy,
-		PreRun: common.CheckDocker,
+		Use:   "destroy",
+		Short: "destroy the kubefirst platform",
+		Long:  "destroy the kubefirst platform running in Goole and remove all resources",
+		RunE:  common.Destroy,
+		// PreRun: common.CheckDocker,
 	}
 
 	return destroyCmd

diff --git a/cmd/k3d/create.go b/cmd/k3d/create.go
@@ -33,7 +33,6 @@ import (
 	"github.com/kubefirst/runtime/configs"
 	"github.com/kubefirst/runtime/pkg"
 	"github.com/kubefirst/runtime/pkg/argocd"
-	"github.com/kubefirst/runtime/pkg/docker"
 	"github.com/kubefirst/runtime/pkg/gitClient"
 	"github.com/kubefirst/runtime/pkg/github"
 	gitlab "github.com/kubefirst/runtime/pkg/gitlab"
@@ -148,14 +147,14 @@ func runK3d(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("%s - this port is required to set up your kubefirst environment - please close any existing port forwards before continuing", err.Error())
 	}
 
-	// Verify Docker is running
-	dcli := docker.DockerClientWrapper{
-		Client: docker.NewDockerClient(),
-	}
-	_, err = dcli.CheckDockerReady()
-	if err != nil {
-		return err
-	}
+	// Verify Docker is running # TODO: reintroduce once we support more runtimes
+	// dcli := docker.DockerClientWrapper{
+	// 	Client: docker.NewDockerClient(),
+	// }
+	// _, err = dcli.CheckDockerReady()
+	// if err != nil {
+	// 	return err
+	// }
 
 	// Global context
 	var ctx context.Context

diff --git a/cmd/launch.go b/cmd/launch.go
@@ -9,7 +9,6 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/kubefirst/kubefirst/internal/common"
 	"github.com/kubefirst/kubefirst/internal/launch"
 	"github.com/spf13/cobra"
 )
@@ -82,7 +81,7 @@ func launchListClusters() *cobra.Command {
 		Use:              "list",
 		Short:            "list clusters created by the kubefirst console",
 		TraverseChildren: true,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 		Run: func(cmd *cobra.Command, args []string) {
 			launch.ListClusters()
 		},
@@ -97,7 +96,7 @@ func launchDeleteCluster() *cobra.Command {
 		Use:              "delete",
 		Short:            "delete a cluster created by the kubefirst console",
 		TraverseChildren: true,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 		Args: func(cmd *cobra.Command, args []string) error {
 			if err := cobra.ExactArgs(1)(cmd, args); err != nil {
 				return fmt.Errorf("you must provide a cluster name as the only argument to this command")

diff --git a/cmd/vultr/command.go b/cmd/vultr/command.go
@@ -65,7 +65,7 @@ func Create() *cobra.Command {
 		Short:            "create the kubefirst platform running on Vultr kubernetes",
 		TraverseChildren: true,
 		RunE:             createVultr,
-		PreRun:           common.CheckDocker,
+		// PreRun:           common.CheckDocker,
 	}
 
 	// todo review defaults and update descriptions
@@ -91,11 +91,11 @@ func Create() *cobra.Command {
 
 func Destroy() *cobra.Command {
 	destroyCmd := &cobra.Command{
-		Use:    "destroy",
-		Short:  "destroy the kubefirst platform",
-		Long:   "destroy the kubefirst platform running in Vultr and remove all resources",
-		RunE:   common.Destroy,
-		PreRun: common.CheckDocker,
+		Use:   "destroy",
+		Short: "destroy the kubefirst platform",
+		Long:  "destroy the kubefirst platform running in Vultr and remove all resources",
+		RunE:  common.Destroy,
+		// PreRun: common.CheckDocker,
 	}
 
 	return destroyCmd

diff --git a/internal/launch/constants.go b/internal/launch/constants.go
@@ -11,7 +11,7 @@ const (
 	helmChartName     = "kubefirst"
 	helmChartRepoName = "kubefirst"
 	helmChartRepoURL  = "https://charts.kubefirst.com"
-	helmChartVersion  = "2.3.1"
+	helmChartVersion  = "2.3.2"
 	namespace         = "kubefirst"
 	secretName        = "kubefirst-initial-secrets"
 )
diff --git a/internal/progress/message.go b/internal/progress/message.go
@@ -11,6 +11,7 @@ package progress
 
 import (
 	"fmt"
+	"log"
 	"strconv"
 
 	"github.com/charmbracelet/glamour"
@@ -20,11 +21,15 @@ import (
 
 func renderMessage(message string) string {
 	r, _ := glamour.NewTermRenderer(
-		glamour.WithStylesFromJSONFile("styles.json"),
+		glamour.WithStyles(StyleConfig),
 		glamour.WithEmoji(),
 	)
 
-	out, _ := r.Render(message)
+	out, err := r.Render(message)
+	if err != nil {
+		log.Println(err.Error())
+		return err.Error()
+	}
 	return out
 }