Merge pull request #8868 from tstromberg/minimal-transition-state

status: Add experimental cluster JSON status with state transition support
kubernetes · Jul 29, 2020 · 47435d9 · 47435d9
2 parents 245e37d + c6e6013
commit 47435d9
Show file tree

Hide file tree

Showing 17 changed files with 533 additions and 87 deletions.
diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
@@ -44,6 +44,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/out/register"
 )
 
 var deleteAll bool
@@ -125,6 +126,8 @@ func runDelete(cmd *cobra.Command, args []string) {
 	if len(args) > 0 {
 		exit.UsageT("Usage: minikube delete")
 	}
+	register.SetEventLogPath(localpath.EventLog(ClusterFlagValue()))
+	register.Reg.SetStep(register.Deleting)
 
 	validProfiles, invalidProfiles, err := config.ListProfiles()
 	if err != nil {
@@ -146,6 +149,8 @@ func runDelete(cmd *cobra.Command, args []string) {
 		deleteContainersAndVolumes(oci.Podman)
 
 		errs := DeleteProfiles(profilesToDelete)
+		register.Reg.SetStep(register.Done)
+
 		if len(errs) > 0 {
 			HandleDeletionErrors(errs)
 		} else {
@@ -166,6 +171,8 @@ func runDelete(cmd *cobra.Command, args []string) {
 		}
 
 		errs := DeleteProfiles([]*config.Profile{profile})
+		register.Reg.SetStep(register.Done)
+
 		if len(errs) > 0 {
 			HandleDeletionErrors(errs)
 		}
@@ -264,6 +271,8 @@ func deletePossibleKicLeftOver(cname string, driverName string) {
 
 func deleteProfile(profile *config.Profile) error {
 	glog.Infof("Deleting %s", profile.Name)
+	register.Reg.SetStep(register.Deleting)
+
 	viper.Set(config.ProfileName, profile.Name)
 	if profile.Config != nil {
 		glog.Infof("%s configuration: %+v", profile.Name, profile.Config)
@@ -326,6 +335,8 @@ func deleteProfile(profile *config.Profile) error {
 }
 
 func deleteHosts(api libmachine.API, cc *config.ClusterConfig) {
+	register.Reg.SetStep(register.Deleting)
+
 	if cc != nil {
 		for _, n := range cc.Nodes {
 			machineName := driver.MachineName(*cc, n)

diff --git a/cmd/minikube/cmd/pause.go b/cmd/minikube/cmd/pause.go
@@ -28,9 +28,11 @@ import (
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/mustload"
 	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/out/register"
 )
 
 var (
@@ -47,8 +49,27 @@ var pauseCmd = &cobra.Command{
 
 func runPause(cmd *cobra.Command, args []string) {
 	co := mustload.Running(ClusterFlagValue())
+	register.SetEventLogPath(localpath.EventLog(ClusterFlagValue()))
+	register.Reg.SetStep(register.Pausing)
+
+	glog.Infof("namespaces: %v keys: %v", namespaces, viper.AllSettings())
+	if allNamespaces {
+		namespaces = nil //all
+	} else if len(namespaces) == 0 {
+		exit.WithCodeT(exit.BadUsage, "Use -A to specify all namespaces")
+	}
+
+	ids := []string{}
 
 	for _, n := range co.Config.Nodes {
+		// Use node-name if available, falling back to cluster name
+		name := n.Name
+		if n.Name == "" {
+			name = co.Config.Name
+		}
+
+		out.T(out.Pause, "Pausing node {{.name}} ... ", out.V{"name": name})
+
 		host, err := machine.LoadHost(co.API, driver.MachineName(*co.Config, n))
 		if err != nil {
 			exit.WithError("Error getting host", err)
@@ -64,23 +85,18 @@ func runPause(cmd *cobra.Command, args []string) {
 			exit.WithError("Failed runtime", err)
 		}
 
-		glog.Infof("namespaces: %v keys: %v", namespaces, viper.AllSettings())
-		if allNamespaces {
-			namespaces = nil //all
-		} else if len(namespaces) == 0 {
-			exit.WithCodeT(exit.BadUsage, "Use -A to specify all namespaces")
-		}
-
-		ids, err := cluster.Pause(cr, r, namespaces)
+		uids, err := cluster.Pause(cr, r, namespaces)
 		if err != nil {
 			exit.WithError("Pause", err)
 		}
+		ids = append(ids, uids...)
+	}
 
-		if namespaces == nil {
-			out.T(out.Unpause, "Paused kubelet and {{.count}} containers", out.V{"count": len(ids)})
-		} else {
-			out.T(out.Unpause, "Paused kubelet and {{.count}} containers in: {{.namespaces}}", out.V{"count": len(ids), "namespaces": strings.Join(namespaces, ", ")})
-		}
+	register.Reg.SetStep(register.Done)
+	if namespaces == nil {
+		out.T(out.Unpause, "Paused {{.count}} containers", out.V{"count": len(ids)})
+	} else {
+		out.T(out.Unpause, "Paused {{.count}} containers in: {{.namespaces}}", out.V{"count": len(ids), "namespaces": strings.Join(namespaces, ", ")})
 	}
 }
 

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -124,6 +124,8 @@ func platform() string {
 
 // runStart handles the executes the flow of "minikube start"
 func runStart(cmd *cobra.Command, args []string) {
+	register.SetEventLogPath(localpath.EventLog(ClusterFlagValue()))
+
 	out.SetJSON(viper.GetString(startOutput) == "json")
 	displayVersion(version.GetVersion())