Simplify upgrader clause.

See Azure#3924
mboersma · Oct 3, 2018 · 5072536 · 5072536
1 parent 7e9869a
commit 5072536
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/pkg/operations/kubernetesupgrade/upgradecluster.go b/pkg/operations/kubernetesupgrade/upgradecluster.go
@@ -116,16 +116,12 @@ func (uc *UpgradeCluster) UpgradeCluster(subscriptionID uuid.UUID, kubeConfig, r
 
 	case strings.HasPrefix(upgradeVersion, "1.9."),
 		strings.HasPrefix(upgradeVersion, "1.10."),
-		strings.HasPrefix(upgradeVersion, "1.11."):
+		strings.HasPrefix(upgradeVersion, "1.11."),
+		strings.HasPrefix(upgradeVersion, "1.12."):
 		u := &Upgrader{}
 		u.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
 		upgrader = u
 
-	case strings.HasPrefix(upgradeVersion, "1.12."):
-		upgrader112 := &Upgrader{}
-		upgrader112.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion)
-		upgrader = upgrader112
-
 	default:
 		return uc.Translator.Errorf("Upgrade to Kubernetes version %s is not supported", upgradeVersion)
 	}