Skip to content

Commit

Permalink
added condition for the case when user try to enable addons without k…
Browse files Browse the repository at this point in the history
…ubernetes
  • Loading branch information
NikhilSharmaWe committed Feb 5, 2022
1 parent 74452b5 commit a3a8e09
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cmd/minikube/cmd/config/enable.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ var addonsEnableCmd = &cobra.Command{
if len(args) != 1 {
exit.Message(reason.Usage, "usage: minikube addons enable ADDON_NAME")
}
if ClusterConfig, err := config.Load(ClusterFlagValue()); err == nil {
if ClusterConfig.KubernetesConfig.KubernetesVersion == constants.NoKubernetesVersion {
exit.Message(reason.Usage, "Cannot enable addons with --no-kubernetes passed")
}
}
addon := args[0]
// replace heapster as metrics-server because heapster is deprecated
if addon == "heapster" {
Expand All @@ -62,7 +67,7 @@ var addonsEnableCmd = &cobra.Command{
}
out.Styled(style.Tip, `Some dashboard features require the metrics-server addon. To enable all features please run:
minikube{{.profileArg}} addons enable metrics-server
minikube{{.profileArg}} addons enable metrics-server
`, out.V{"profileArg": tipProfileArg})

Expand Down
9 changes: 9 additions & 0 deletions cmd/minikube/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *

validateFlags(cmd, driverName)
validateUser(driverName)
validateNoAddonsForNoKubernetes()
if driverName == oci.Docker {
validateDockerStorageDriver(driverName)
}
Expand Down Expand Up @@ -1652,3 +1653,11 @@ func exitGuestProvision(err error) {
}
exit.Error(reason.GuestProvision, "error provisioning guest", err)
}

func validateNoAddonsForNoKubernetes() {
if ClusterConfig, err := config.Load(ClusterFlagValue()); err == nil {
if ClusterConfig.KubernetesConfig.KubernetesVersion == constants.NoKubernetesVersion {
exit.Message(reason.Usage, "Cannot enable addons with --no-kubernetes passed")
}
}
}

0 comments on commit a3a8e09

Please sign in to comment.