From f88c6ad3cd9530a55d2d03a50c2cb558401cc026 Mon Sep 17 00:00:00 2001 From: Shubh Bapna Date: Fri, 17 Feb 2023 11:00:22 -0500 Subject: [PATCH] added isEnabledOrDefault --- pkg/addons/addons.go | 2 +- pkg/minikube/assets/addons.go | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go index 59a6187a23..0fd2d0cb1c 100644 --- a/pkg/addons/addons.go +++ b/pkg/addons/addons.go @@ -538,7 +538,7 @@ func ToEnable(cc *config.ClusterConfig, existing map[string]bool, additional []s // Get the default values of any addons not saved to our config for name, a := range assets.Addons { if _, exists := existing[name]; !exists { - enable[name] = a.IsEnabled(cc) + enable[name] = a.IsEnabledOrDefault(cc) } } diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 8faba03c30..4c7ee492a2 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -80,6 +80,16 @@ func (a *Addon) IsEnabled(cc *config.ClusterConfig) bool { return status } + return false +} + +// IsEnabledOrDefault checks if an Addon is enabled for the given profile. If not found in profile it returns the default state +func (a *Addon) IsEnabledOrDefault(cc *config.ClusterConfig) bool { + status, ok := cc.Addons[a.Name()] + if ok { + return status + } + // Return the default unconfigured state of the addon return a.enabled }