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

medyagh · web-flow · commit 256b90acf08c · 2020-02-28T09:08:27.000-08:00
Fix: disable a disabled addon cause error
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 {

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@ func enableOrDisableAddon(name, val, profile string) error {`
`118`	`118`
`119`	`119`	`if alreadySet {`
`120`	`120`	`glog.Warningf("addon %s should already be in state %v", name, val)`
	`121`	`+ if !enable {`
	`122`	`+ return nil`
	`123`	`+ }`
`121`	`124`	`}`
`122`	`125`
`123`	`126`	`if name == "istio" && enable {`