Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable or disable addons per profile #6124

Merged
merged 19 commits into from
Jan 7, 2020
Merged

Enable or disable addons per profile #6124

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ba8b723
Move addon related logic to pkg/addons for better organization
Dec 18, 2019
e72cb80
Enable/disable addons works per profile
Dec 19, 2019
921fee7
Moved unit tests to addons package and refactored them
Dec 19, 2019
ceb4938
Add more unit tests
Dec 19, 2019
43a7267
make public methods that aren't used outside of the package private
Dec 19, 2019
4c7b949
Address review comments
Dec 19, 2019
f6c61b7
Make sure minikube start --addons works
Dec 19, 2019
859420c
Merge branch 'master' of github.com:kubernetes/minikube into addon-pe…
Dec 19, 2019
83aca57
Merge branch 'master' of github.com:kubernetes/minikube into addon-pe…
Dec 19, 2019
fa08e18
goimports
Dec 19, 2019
b64a33a
updated dashboard command to use new addons library
Dec 19, 2019
2f50957
increase wait times for pods, virtualbox integration test was timing out
Dec 20, 2019
6c25cd3
Rebased on master
Dec 20, 2019
81a2c16
try running addons test in sequence, since parallel test seems to be …
Dec 20, 2019
e47cde6
Rebased on master, moved istio addon into new package
Dec 30, 2019
1126f26
Parallelize test again, running locally with virtualbox on macOS was …
Dec 30, 2019
44cde77
update gvisor addon test now that addons are per profile
Dec 30, 2019
885ec3c
Don't run TestAddons in parallel with other tests, virtualbox on linu…
Jan 2, 2020
6ad7e4a
address code review comments
Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 2 additions & 117 deletions cmd/minikube/cmd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,123 +142,8 @@ var settings = []Setting{
set: SetBool,
},
{
name: "dashboard",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "istio-provisioner",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "istio",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "addon-manager",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "default-storageclass",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableStorageClasses},
},
{
name: "efk",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "ingress",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "insecure-registry",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "registry",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "registry-creds",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "freshpod",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "storage-provisioner",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "storage-provisioner-gluster",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableStorageClasses},
},
{
name: "metrics-server",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "nvidia-driver-installer",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "nvidia-gpu-device-plugin",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "logviewer",
set: SetBool,
validations: []setFn{IsValidAddon},
},
{
name: "gvisor",
set: SetBool,
validations: []setFn{IsValidAddon, IsContainerdRuntime},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "helm-tiller",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
},
{
name: "ingress-dns",
set: SetBool,
validations: []setFn{IsValidAddon},
callbacks: []setFn{EnableOrDisableAddon},
name: "insecure-registry",
set: SetString,
},
{
name: "hyperv-virtual-switch",
Expand Down
5 changes: 4 additions & 1 deletion cmd/minikube/cmd/config/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ package config

import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/out"
)
Expand All @@ -32,7 +35,7 @@ var addonsDisableCmd = &cobra.Command{
}

addon := args[0]
err := Set(addon, "false")
err := addons.Set(addon, "false", viper.GetString(config.MachineProfile))
if err != nil {
exit.WithError("disable failed", err)
}
Expand Down
39 changes: 0 additions & 39 deletions cmd/minikube/cmd/config/disable_test.go
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion cmd/minikube/cmd/config/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ package config

import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/out"
)
Expand All @@ -32,7 +35,7 @@ var addonsEnableCmd = &cobra.Command{
}

addon := args[0]
err := Set(addon, "true")
err := addons.Set(addon, "true", viper.GetString(config.MachineProfile))
if err != nil {
exit.WithError("enable failed", err)
}
Expand Down
39 changes: 0 additions & 39 deletions cmd/minikube/cmd/config/enable_test.go
View file
Open in desktop

This file was deleted.

Loading