Merge pull request #6817 from sshukun/fix-addon-disable

Fix: disable a disabled addon cause error
kubernetes · Feb 28, 2020 · 256b90a · 256b90a
2 parents 3cb2b36 + 884c30a
commit 256b90a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/addons/addons.go b/pkg/addons/addons.go
@@ -118,6 +118,9 @@ func enableOrDisableAddon(name, val, profile string) error {
 
 	if alreadySet {
 		glog.Warningf("addon %s should already be in state %v", name, val)
+		if !enable {
+			return nil
+		}
 	}
 
 	if name == "istio" && enable {