From fc6486410f6c0f4c469bdf2105af39a0821ed4f3 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Fri, 28 Sep 2018 15:00:42 -0600 Subject: [PATCH] Simplify some upgrader version cases --- .../kubernetesupgrade/upgradecluster.go | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkg/operations/kubernetesupgrade/upgradecluster.go b/pkg/operations/kubernetesupgrade/upgradecluster.go index 8a086464e0..6786255412 100644 --- a/pkg/operations/kubernetesupgrade/upgradecluster.go +++ b/pkg/operations/kubernetesupgrade/upgradecluster.go @@ -112,23 +112,13 @@ func (uc *UpgradeCluster) UpgradeCluster(subscriptionID uuid.UUID, kubeConfig, r case strings.HasPrefix(upgradeVersion, "1.8."): upgrader18 := &Kubernetes18upgrader{} upgrader18.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion) - upgrader = upgrader18 - case strings.HasPrefix(upgradeVersion, "1.9."): - upgrader19 := &Upgrader{} - upgrader19.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion) - upgrader = upgrader19 - - case strings.HasPrefix(upgradeVersion, "1.10."): - upgrader110 := &Upgrader{} - upgrader110.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion) - upgrader = upgrader110 - - case strings.HasPrefix(upgradeVersion, "1.11."): - upgrader111 := &Upgrader{} - upgrader111.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion) - upgrader = upgrader111 + case strings.HasPrefix(upgradeVersion, "1.9."), + strings.HasPrefix(upgradeVersion, "1.10."), + strings.HasPrefix(upgradeVersion, "1.11."): + upgrader := &Upgrader{} + upgrader.Init(uc.Translator, uc.Logger, uc.ClusterTopology, uc.Client, kubeConfig, uc.StepTimeout, acsengineVersion) default: return uc.Translator.Errorf("Upgrade to Kubernetes version %s is not supported", upgradeVersion)