Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
fix: reinforce MCR migration during upgrade for older clusters (#3625)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackfrancis
jackfrancis authored Jul 21, 2020
1 parent b06a18b commit 2776170
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/api/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ func (cs *ContainerService) setOrchestratorDefaults(isUpgrade, isScale bool) {
}

if isUpgrade {
if o.KubernetesConfig.KubernetesImageBase == cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase &&
o.KubernetesConfig.KubernetesImageBaseType == common.KubernetesImageBaseTypeGCR {
if (o.KubernetesConfig.KubernetesImageBase == "" || o.KubernetesConfig.KubernetesImageBase == cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase) &&
(o.KubernetesConfig.KubernetesImageBaseType == "" || o.KubernetesConfig.KubernetesImageBaseType == common.KubernetesImageBaseTypeGCR) {
o.KubernetesConfig.KubernetesImageBase = cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase
o.KubernetesConfig.KubernetesImageBaseType = common.KubernetesImageBaseTypeMCR
}
Expand Down
48 changes: 48 additions & 0 deletions pkg/api/defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,54 @@ func TestKubernetesImageBase(t *testing.T) {
t.Fatalf("defaults flow did assign the expected KubernetesImageBaseType value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType, common.KubernetesImageBaseTypeMCR)
}

// Upgrade scenario forces to MCR - empty KubernetesImageBase and KubernetesImageBaseType
mockCS = getMockBaseContainerService("1.17.4")
mockCS.Location = "westus2"
cloudSpecConfig = mockCS.GetCloudSpecConfig()
properties = mockCS.Properties
properties.OrchestratorProfile.OrchestratorType = Kubernetes
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase = ""
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType = ""
mockCS.setOrchestratorDefaults(true, false)
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase != cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase {
t.Fatalf("defaults flow did assign the expected KubernetesImageBase value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase, cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase)
}
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType != common.KubernetesImageBaseTypeMCR {
t.Fatalf("defaults flow did assign the expected KubernetesImageBaseType value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType, common.KubernetesImageBaseTypeMCR)
}

// Upgrade scenario forces GCR to MCR - empty KubernetesImageBase
mockCS = getMockBaseContainerService("1.17.4")
mockCS.Location = "westus2"
cloudSpecConfig = mockCS.GetCloudSpecConfig()
properties = mockCS.Properties
properties.OrchestratorProfile.OrchestratorType = Kubernetes
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase = ""
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType = common.KubernetesImageBaseTypeGCR
mockCS.setOrchestratorDefaults(true, false)
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase != cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase {
t.Fatalf("defaults flow did assign the expected KubernetesImageBase value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase, cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase)
}
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType != common.KubernetesImageBaseTypeMCR {
t.Fatalf("defaults flow did assign the expected KubernetesImageBaseType value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType, common.KubernetesImageBaseTypeMCR)
}

// Upgrade scenario forces GCR to MCR - empty KubernetesImageBaseType
mockCS = getMockBaseContainerService("1.17.4")
mockCS.Location = "westus2"
cloudSpecConfig = mockCS.GetCloudSpecConfig()
properties = mockCS.Properties
properties.OrchestratorProfile.OrchestratorType = Kubernetes
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase = "k8s.gcr.io/"
properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType = ""
mockCS.setOrchestratorDefaults(true, false)
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase != cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase {
t.Fatalf("defaults flow did assign the expected KubernetesImageBase value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase, cloudSpecConfig.KubernetesSpecConfig.MCRKubernetesImageBase)
}
if properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType != common.KubernetesImageBaseTypeMCR {
t.Fatalf("defaults flow did assign the expected KubernetesImageBaseType value, got %s, expected %s", properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBaseType, common.KubernetesImageBaseTypeMCR)
}

// Upgrade scenario doesn't force user-customized GCR
mockCS = getMockBaseContainerService("1.17.4")
mockCS.Location = "westus2"
Expand Down

0 comments on commit 2776170

Please sign in to comment.