add more constants
parent
cd9d263b9f
commit
5bcdba0a09
|
@ -25,6 +25,7 @@ import (
|
||||||
|
|
||||||
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
|
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
|
||||||
"k8s.io/minikube/pkg/minikube/config"
|
"k8s.io/minikube/pkg/minikube/config"
|
||||||
|
"k8s.io/minikube/pkg/minikube/constants"
|
||||||
"k8s.io/minikube/pkg/minikube/driver"
|
"k8s.io/minikube/pkg/minikube/driver"
|
||||||
"k8s.io/minikube/pkg/minikube/exit"
|
"k8s.io/minikube/pkg/minikube/exit"
|
||||||
"k8s.io/minikube/pkg/minikube/machine"
|
"k8s.io/minikube/pkg/minikube/machine"
|
||||||
|
@ -165,7 +166,7 @@ func profilesToTableData(profiles []*config.Profile) [][]string {
|
||||||
}
|
}
|
||||||
|
|
||||||
k8sVersion := p.Config.KubernetesConfig.KubernetesVersion
|
k8sVersion := p.Config.KubernetesConfig.KubernetesVersion
|
||||||
if k8sVersion == "v0.0.0" { // for --no-kubernetes flag
|
if k8sVersion == constants.NoKubernetesVersion { // for --no-kubernetes flag
|
||||||
k8sVersion = "N/A"
|
k8sVersion = "N/A"
|
||||||
}
|
}
|
||||||
data = append(data, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime, cp.IP, strconv.Itoa(cp.Port), k8sVersion, p.Status, strconv.Itoa(len(p.Config.Nodes))})
|
data = append(data, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime, cp.IP, strconv.Itoa(cp.Port), k8sVersion, p.Status, strconv.Itoa(len(p.Config.Nodes))})
|
||||||
|
|
|
@ -433,7 +433,7 @@ func displayEnviron(env []string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName string) error {
|
func showKubectlInfo(kcs *kubeconfig.Settings, k8sVersion string, machineName string) error {
|
||||||
if k8sVersion == "v0.0.0" {
|
if k8sVersion == constants.NoKubernetesVersion {
|
||||||
register.Reg.SetStep(register.Done)
|
register.Reg.SetStep(register.Done)
|
||||||
out.Step(style.Ready, "Done! minikube is ready without Kubernetes!")
|
out.Step(style.Ready, "Done! minikube is ready without Kubernetes!")
|
||||||
out.BoxedWithConfig(box.Config{Py: 1, Px: 4, Type: "Round", Color: "Green"}, style.Tip, "Things to try without Kubernetes ...", `- "minikube ssh" to SSH into minikube's node.
|
out.BoxedWithConfig(box.Config{Py: 1, Px: 4, Type: "Round", Color: "Green"}, style.Tip, "Things to try without Kubernetes ...", `- "minikube ssh" to SSH into minikube's node.
|
||||||
|
|
|
@ -89,7 +89,7 @@ type Starter struct {
|
||||||
// Start spins up a guest and starts the Kubernetes node.
|
// Start spins up a guest and starts the Kubernetes node.
|
||||||
func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
|
func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) {
|
||||||
var kcs *kubeconfig.Settings
|
var kcs *kubeconfig.Settings
|
||||||
if starter.Node.KubernetesVersion == "v0.0.0" {
|
if starter.Node.KubernetesVersion == constants.NoKubernetesVersion { // do not bootstrap cluster if --no-kubernetes
|
||||||
return kcs, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
|
return kcs, config.Write(viper.GetString(config.ProfileName), starter.Cfg)
|
||||||
}
|
}
|
||||||
// wait for preloaded tarball to finish downloading before configuring runtimes
|
// wait for preloaded tarball to finish downloading before configuring runtimes
|
||||||
|
@ -294,7 +294,7 @@ func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool, delOnFa
|
||||||
if !apiServer {
|
if !apiServer {
|
||||||
startingPhrase = "Starting worker node"
|
startingPhrase = "Starting worker node"
|
||||||
}
|
}
|
||||||
if cc.KubernetesConfig.KubernetesVersion == "v0.0.0" {
|
if cc.KubernetesConfig.KubernetesVersion == constants.NoKubernetesVersion {
|
||||||
startingPhrase = "Starting minikube without Kubernetes"
|
startingPhrase = "Starting minikube without Kubernetes"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue