diff --git a/cmd/k3d/create.go b/cmd/k3d/create.go index 07b00af6d..ba154f4ed 100644 --- a/cmd/k3d/create.go +++ b/cmd/k3d/create.go @@ -1334,7 +1334,7 @@ func runK3d(cmd *cobra.Command, args []string) error { progressPrinter.IncrementTracker("wrapping-up", 1) // Wait for console Deployment Pods to transition to Running - consoleDeployment, err := k8s.ReturnDeploymentObject( + argoDeployment, err := k8s.ReturnDeploymentObject( kcfg.Clientset, "app.kubernetes.io/instance", "argo", @@ -1345,12 +1345,11 @@ func runK3d(cmd *cobra.Command, args []string) error { log.Error().Msgf("Error finding argo workflows Deployment: %s", err) return err } - _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, consoleDeployment, 120) + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, argoDeployment, 120) if err != nil { log.Error().Msgf("Error waiting for argo workflows Deployment ready state: %s", err) return err } - progressPrinter.IncrementTracker("wrapping-up", 1) // Mark cluster install as complete telemetryShim.Transmit(useTelemetryFlag, segmentClient, segment.MetricClusterInstallCompleted, "") @@ -1370,6 +1369,24 @@ func runK3d(cmd *cobra.Command, args []string) error { viper.WriteConfig() return err } else { + kubefirstDeployment, err := k8s.ReturnDeploymentObject( + kcfg.Clientset, + "app.kubernetes.io/instance", + "kubefirst", + "kubefirst", + 600, + ) + if err != nil { + log.Error().Msgf("Error finding kubefirst Deployment: %s", err) + return err + } + _, err = k8s.WaitForDeploymentReady(kcfg.Clientset, kubefirstDeployment, 120) + if err != nil { + log.Error().Msgf("Error waiting for kubefirst Deployment ready state: %s", err) + return err + } + progressPrinter.IncrementTracker("wrapping-up", 1) + err = pkg.OpenBrowser(pkg.KubefirstConsoleLocalURLTLS) if err != nil { log.Error().Err(err).Msg("") diff --git a/go.mod b/go.mod index 238be2be3..271e8c184 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/go-git/go-git/v5 v5.6.1 github.com/hashicorp/vault/api v1.9.0 github.com/kubefirst/kubefirst-api v0.0.2 - github.com/kubefirst/runtime v0.3.24 + github.com/kubefirst/runtime v0.3.28 github.com/rs/zerolog v1.29.0 github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.7.0 diff --git a/go.sum b/go.sum index f1bc9fcb7..bdb030ec4 100644 --- a/go.sum +++ b/go.sum @@ -733,8 +733,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubefirst/kubefirst-api v0.0.2 h1:ezvCOiafSJ9arapBAnewDU8a/r3VO6GAJywQrQs9QDU= github.com/kubefirst/kubefirst-api v0.0.2/go.mod h1:SFnfUf9aY0sLmju1UvDGxLHL3mxGV94RzHwHrf27vsI= -github.com/kubefirst/runtime v0.3.24 h1:qXmQnn3kXmKNenY0DPn/0k6479Ydv3AZr7o7lOu9eTI= -github.com/kubefirst/runtime v0.3.24/go.mod h1:Ms1VyNgJW2thrAA+fj1V6bCN1DcbOyzIzw9Vc3WZkjg= +github.com/kubefirst/runtime v0.3.28 h1:Ac9NzqX+H0fa4tUauOMrjbtpSFnNluLYmSk6v5u++G4= +github.com/kubefirst/runtime v0.3.28/go.mod h1:9egAgF5cF594mIzra5nTB1kfE57Hr/Nvl79tjLsAWCQ= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=