Azure
/
aks-engine
зеркало из https://github.com/Azure/aks-engine.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: remove support for Kubernetes 1.10.x (#2234)

This commit is contained in:
Matt Boersma 2019-10-29 17:06:58 -06:00 коммит произвёл GitHub
Родитель 9b1cac0bdf
Коммит b38cedd594
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
27 изменённых файлов: 69 добавлений и 110 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
cmd/generate_test.go
Просмотреть файл

@ -499,11 +499,6 @@ func TestExampleAPIModels(t *testing.T) {
apiModelPath: "../examples/kubernetes-msi-userassigned/kube-vmss.json",
setArgs: defaultSet,
},
{
name: "1.10 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.10.json",
setArgs: defaultSet,
},
{
name: "1.11 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.11.json",

2
cmd/rotate_certs_test.go
Просмотреть файл

@ -247,7 +247,7 @@ func TestDeleteServiceAccounts(t *testing.T) {
func TestWriteArtifacts(t *testing.T) {
g := NewGomegaWithT(t)
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.11.10", 3, 2, false)
cs.SetPropertiesDefaults(api.PropertiesDefaultsParams{
IsScale: false,
IsUpgrade: false,

2
examples/addons/cluster-autoscaler/kubernetes-cluster-autoscaler.json
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"useManagedIdentity": true,
"addons": [

2
examples/addons/nvidia-device-plugin/nvidia-device-plugin.json
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"addons": [
{

36
examples/kubernetes-releases/kubernetes1.10.json
Просмотреть файл

@ -1,36 +0,0 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}

2
examples/windows/kubernetes-hyperv.json
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"apiServerConfig" : {
"--feature-gates": "HyperVContainer=true"

4
pkg/api/common/versions.go
Просмотреть файл

@ -72,8 +72,8 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.10.7": false,
"1.10.8": false,
"1.10.9": false,
"1.10.12": true,
"1.10.13": true,
"1.10.12": false,
"1.10.13": false,
"1.11.0-alpha.1": false,
"1.11.0-alpha.2": false,
"1.11.0-beta.1": false,

2
pkg/api/convertertoagentpoolonlyapi_test.go
Просмотреть файл

@ -14,7 +14,7 @@ import (
)
func TestConvertV20180331AgentPoolOnlyOrchestratorProfile(t *testing.T) {
kubernetesVersion := "1.10.13"
kubernetesVersion := "1.11.10"
networkPlugin := v20180331.Azure
networkPolicy := v20180331.NetworkPolicyCalico
networkPluginKubenet := v20180331.Kubenet

4
pkg/api/convertertoapi_test.go
Просмотреть файл

@ -137,7 +137,7 @@ func TestOrchestratorVersion(t *testing.T) {
Properties: &vlabs.Properties{
OrchestratorProfile: &vlabs.OrchestratorProfile{
OrchestratorType: vlabs.Kubernetes,
OrchestratorVersion: "1.10.13",
OrchestratorVersion: "1.11.10",
},
},
}
@ -145,7 +145,7 @@ func TestOrchestratorVersion(t *testing.T) {
if err != nil {
t.Fatalf("Failed to convert ContainerService, error: %s", err)
}
if cs.Properties.OrchestratorProfile.OrchestratorVersion != "1.10.13" {
if cs.Properties.OrchestratorProfile.OrchestratorVersion != "1.11.10" {
t.Fatalf("incorrect OrchestratorVersion '%s'", cs.Properties.OrchestratorProfile.OrchestratorVersion)
}
}

10
pkg/api/defaults_test.go
Просмотреть файл

@ -198,14 +198,14 @@ func TestAssignDefaultAddonImages(t *testing.T) {
defaultAddonImages := map[string]string{
TillerAddonName: "gcr.io/kubernetes-helm/tiller:v2.13.1",
ACIConnectorAddonName: "microsoft/virtual-kubelet:latest",
ClusterAutoscalerAddonName: "k8s.gcr.io/cluster-autoscaler:v1.2.5",
ClusterAutoscalerAddonName: "k8s.gcr.io/cluster-autoscaler:v1.3.9",
BlobfuseFlexVolumeAddonName: "mcr.microsoft.com/k8s/flexvolume/blobfuse-flexvolume:1.0.8",
SMBFlexVolumeAddonName: "mcr.microsoft.com/k8s/flexvolume/smb-flexvolume:1.0.2",
KeyVaultFlexVolumeAddonName: "mcr.microsoft.com/k8s/flexvolume/keyvault-flexvolume:v0.0.13",
DashboardAddonName: "k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1",
ReschedulerAddonName: "k8s.gcr.io/rescheduler:v0.3.1",
ReschedulerAddonName: "k8s.gcr.io/rescheduler:v0.4.0",
MetricsServerAddonName: "k8s.gcr.io/metrics-server-amd64:v0.2.1",
NVIDIADevicePluginAddonName: "nvidia/k8s-device-plugin:1.10",
NVIDIADevicePluginAddonName: "nvidia/k8s-device-plugin:1.11",
ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
IPMASQAgentAddonName: "k8s.gcr.io/ip-masq-agent-amd64:v2.5.0",
AzureCNINetworkMonitoringAddonName: "mcr.microsoft.com/containernetworking/networkmonitor:v0.0.6",
@ -252,7 +252,7 @@ func TestAssignDefaultAddonImages(t *testing.T) {
c := c
t.Run(c.name, func(t *testing.T) {
t.Parallel()
mockCS := getMockBaseContainerService("1.10.8")
mockCS := getMockBaseContainerService("1.11.10")
mockCS.Properties.OrchestratorProfile.OrchestratorType = Kubernetes
mockCS.Properties.OrchestratorProfile.KubernetesConfig.Addons = c.myAddons
mockCS.setOrchestratorDefaults(c.isUpdate, c.isUpdate)
@ -1140,7 +1140,7 @@ func TestStorageProfile(t *testing.T) {
properties.AgentPoolProfiles[0].AvailabilityProfile, AvailabilitySet)
}
mockCS = getMockBaseContainerService("1.10.2")
mockCS = getMockBaseContainerService("1.11.10")
properties = mockCS.Properties
properties.OrchestratorProfile.OrchestratorType = Kubernetes
mockCS.SetPropertiesDefaults(PropertiesDefaultsParams{

2
pkg/api/types_test.go
Просмотреть файл

@ -42,7 +42,7 @@ const exampleAKSAPIModel = `{
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.12",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [ { "name": "agentpool1", "count": 2, "vmSize": "Standard_D2_v2" } ],
"linuxProfile": { "adminUsername": "azureuser", "ssh": { "publicKeys": [ { "keyData": "" } ] }
},

22
pkg/api/vlabs/validate_test.go
Просмотреть файл

@ -124,7 +124,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
properties: &Properties{
OrchestratorProfile: &OrchestratorProfile{
OrchestratorType: "Kubernetes",
OrchestratorVersion: "1.10.13",
OrchestratorVersion: "1.11.10",
KubernetesConfig: &KubernetesConfig{
EnableAggregatedAPIs: true,
EnableRbac: &falseVal,
@ -161,7 +161,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
properties: &Properties{
OrchestratorProfile: &OrchestratorProfile{
OrchestratorType: "Kubernetes",
OrchestratorVersion: "1.10.13",
OrchestratorVersion: "1.11.10",
KubernetesConfig: &KubernetesConfig{
EnableDataEncryptionAtRest: &trueVal,
EtcdEncryptionKey: "fakeEncryptionKey",
@ -198,7 +198,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
properties: &Properties{
OrchestratorProfile: &OrchestratorProfile{
OrchestratorType: "Kubernetes",
OrchestratorVersion: "1.10.13",
OrchestratorVersion: "1.11.10",
KubernetesConfig: &KubernetesConfig{
EnablePodSecurityPolicy: &trueVal,
},
@ -294,7 +294,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
properties: &Properties{
OrchestratorProfile: &OrchestratorProfile{
OrchestratorType: "Kubernetes",
OrchestratorVersion: "v1.10.13",
OrchestratorVersion: "v1.11.10",
},
},
},
@ -1416,10 +1416,10 @@ func Test_Properties_ValidateAddons(t *testing.T) {
"should error on azure-policy with k8s < 1.10",
)
}
p.OrchestratorProfile.OrchestratorRelease = "1.10"
p.OrchestratorProfile.OrchestratorRelease = "1.11"
if err := p.validateAddons(); err != nil {
t.Errorf(
"should not error on azure-policy with k8s >= 1.10",
"should not error on azure-policy with k8s >= 1.11",
)
}
@ -1450,10 +1450,10 @@ func Test_Properties_ValidateAddons(t *testing.T) {
)
}
p.OrchestratorProfile.OrchestratorRelease = "1.10"
p.OrchestratorProfile.OrchestratorRelease = "1.11"
if err := p.validateAddons(); err != nil {
t.Errorf(
"should not error on nvidia-device-plugin with k8s >= 1.10",
"should not error on nvidia-device-plugin with k8s >= 1.11",
)
}
p.OrchestratorProfile.KubernetesConfig = &KubernetesConfig{
@ -2094,7 +2094,7 @@ func TestMasterProfileValidate(t *testing.T) {
{
name: "Master Profile with VMSS and storage account",
orchestratorType: Kubernetes,
orchestratorRelease: "1.10",
orchestratorRelease: "1.11",
masterProfile: MasterProfile{
DNSPrefix: "dummy",
Count: 3,
@ -2106,7 +2106,7 @@ func TestMasterProfileValidate(t *testing.T) {
{
name: "Master Profile with VMSS and agent profiles with VMAS",
orchestratorType: Kubernetes,
orchestratorRelease: "1.10",
orchestratorRelease: "1.11",
masterProfile: MasterProfile{
DNSPrefix: "dummy",
Count: 3,
@ -2670,7 +2670,7 @@ func TestProperties_ValidateVNET(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
cs := getK8sDefaultContainerService(true)
cs.Properties.OrchestratorProfile.OrchestratorRelease = "1.10"
cs.Properties.OrchestratorProfile.OrchestratorRelease = "1.11"
cs.Properties.MasterProfile = test.masterProfile
cs.Properties.AgentPoolProfiles = test.agentPoolProfiles
err := cs.Validate(true)

4
pkg/armhelpers/mockclients.go
Просмотреть файл

@ -27,7 +27,7 @@ import (
)
const (
defaultK8sVersionForFakeVMs = "Kubernetes:1.9.10"
defaultK8sVersionForFakeVMs = "Kubernetes:1.11.10"
//DefaultFakeVMName is the default name assigned to VMs part of FakeListVirtualMachineScaleSetVMsResult and FakeListVirtualMachineResult
DefaultFakeVMName = "k8s-agentpool1-12345678-0"
)
@ -350,7 +350,7 @@ func (mkc *MockKubernetesClient) GetNode(name string) (*v1.Node, error) {
}
node := &v1.Node{}
node.Status.Conditions = append(node.Status.Conditions, v1.NodeCondition{Type: v1.NodeReady, Status: v1.ConditionTrue})
node.Status.NodeInfo.KubeletVersion = "1.9.10"
node.Status.NodeInfo.KubeletVersion = "1.11.10"
return node, nil
}

2
pkg/engine/testdata/addons/kubernetes-custom-psp.json поставляемый
Просмотреть файл

@ -5,7 +5,7 @@
"provisioningState": "",
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"enablePodSecurityPolicy": true,
"enableRbac": true,

2
pkg/engine/testdata/addons/kubernetes-kube-proxy.json поставляемый
Просмотреть файл

@ -5,7 +5,7 @@
"provisioningState": "",
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"addons": [
{

2
pkg/engine/testdata/addons/kubernetes.json поставляемый
Просмотреть файл

@ -5,7 +5,7 @@
"provisioningState": "",
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"addons": [
{

2
pkg/engine/testdata/agentPoolOnly/v20170831/agents.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.13",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [
{
"name": "agentpool1",

2
pkg/engine/testdata/agentPoolOnly/v20180331/agents.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.13",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [
{
"name": "agentpool1",

2
pkg/engine/testdata/agentPoolOnly/v20180331/agentsWithFullNetworkProfile.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.13",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [
{
"name": "agentpool1",

2
pkg/engine/testdata/agentPoolOnly/v20180331/agentsWithFullNetworkProfileV2.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.13",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [
{
"name": "agentpool1",

2
pkg/engine/testdata/agentPoolOnly/v20180331/agentsWithOnlyNetworkPlugin.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"dnsPrefix": "agents006",
"fqdn": "agents006.azmk8s.io",
"kubernetesVersion": "1.10.13",
"kubernetesVersion": "1.11.10",
"agentPoolProfiles": [
{
"name": "agentpool1",

2
pkg/engine/testdata/disks-managed/kubernetes-vmss.json поставляемый
Просмотреть файл

@ -5,7 +5,7 @@
"provisioningState": "",
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10"
"orchestratorRelease": "1.11"
},
"masterProfile": {
"count": 1,

4
pkg/engine/testdata/kubernetesversions/kubernetes1.10.9.json → pkg/engine/testdata/kubernetesversions/kubernetes1.11.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10"
"orchestratorRelease": "1.11"
},
"masterProfile": {
"count": 1,
@ -58,4 +58,4 @@
]
}
}
}
}

2
pkg/engine/testdata/largeclusters/kubernetes-vmss.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10"
"orchestratorRelease": "1.11"
},
"masterProfile": {
"count": 1,

2
pkg/engine/testdata/windows/kubernetes-kubernetesconfig.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"useInstanceMetadata": false,
"windowsNodeBinariesURL": "http://test/test.tar.gz"

2
pkg/engine/testdata/windows/kubernetes-vmss.json поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.10",
"orchestratorRelease": "1.11",
"kubernetesConfig": {
"useInstanceMetadata": false
}

54
pkg/operations/kubernetesupgrade/upgradecluster_test.go
Просмотреть файл

@ -54,7 +54,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should succeed when cluster VMs are missing expected tags during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 1, 1, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 1, 1, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -80,7 +80,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to list VMs during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 1, 1, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 1, 1, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -106,7 +106,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to delete VMs during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 1, 1, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 1, 1, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -129,7 +129,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to deploy template during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 1, 1, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 1, 1, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -152,7 +152,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to get a virtual machine during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 1, 6, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 1, 6, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -175,7 +175,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to get storage client during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 5, 1, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 5, 1, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -198,7 +198,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to delete network interface during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -221,7 +221,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should return error message when failing to delete role assignment during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
cs.Properties.OrchestratorProfile.KubernetesConfig = &api.KubernetesConfig{}
cs.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = true
uc := UpgradeCluster{
@ -255,7 +255,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
BeforeEach(func() {
mockClient = armhelpers.MockAKSEngineClient{MockKubernetesClient: &armhelpers.MockKubernetesClient{}}
cs = api.CreateMockContainerService("testcluster", "1.9.10", 3, 3, false)
cs = api.CreateMockContainerService("testcluster", "1.12.8", 3, 3, false)
uc = UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -284,10 +284,10 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
It("Should skip VMs that are already on desired version", func() {
mockClient.FakeListVirtualMachineScaleSetVMsResult = func() []compute.VirtualMachineScaleSetVM {
return []compute.VirtualMachineScaleSetVM{
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.10"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.9"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.7"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.10"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.12.8"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.12.5"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.12.7"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.12.8"),
}
}
uc.Force = false
@ -355,17 +355,17 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
It("Should use kubernetes api to get node versions for VMSS when latest model is not applied", func() {
trueVar := true
falseVar := false
vmWithoutLatestModelApplied := mockClient.MakeFakeVirtualMachineScaleSetVMWithGivenName("Kubernetes:1.9.10", "vmWithoutLatestModelApplied!")
vmWithoutLatestModelApplied := mockClient.MakeFakeVirtualMachineScaleSetVMWithGivenName("Kubernetes:1.12.8", "vmWithoutLatestModelApplied!")
vmWithoutLatestModelApplied.VirtualMachineScaleSetVMProperties.LatestModelApplied = &falseVar
vmWithLatestModelApplied := mockClient.MakeFakeVirtualMachineScaleSetVMWithGivenName("Kubernetes:1.9.10", "vmWithLatestModelApplied")
vmWithLatestModelApplied := mockClient.MakeFakeVirtualMachineScaleSetVMWithGivenName("Kubernetes:1.12.8", "vmWithLatestModelApplied")
vmWithLatestModelApplied.VirtualMachineScaleSetVMProperties.LatestModelApplied = &trueVar
mockClient.MockKubernetesClient.GetNodeFunc = func(name string) (*v1.Node, error) {
node := &v1.Node{}
node.Status.NodeInfo.KubeletVersion = "v1.9.7"
node.Status.NodeInfo.KubeletVersion = "v1.12.7"
node.Status = v1.NodeStatus{}
node.Status.NodeInfo = v1.NodeSystemInfo{
KubeletVersion: "v1.9.7",
KubeletVersion: "v1.12.7",
}
return node, nil
@ -436,7 +436,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
BeforeEach(func() {
mockClient = armhelpers.MockAKSEngineClient{}
cs = api.CreateMockContainerService("testcluster", "1.9.10", 3, 3, false)
cs = api.CreateMockContainerService("testcluster", "1.11.10", 3, 3, false)
uc = UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -478,10 +478,10 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
It("Should mark scale sets as windows correctly.", func() {
mockClient.FakeListVirtualMachineScaleSetVMsResult = func() []compute.VirtualMachineScaleSetVM {
return []compute.VirtualMachineScaleSetVM{
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.10"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.9"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.7"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.9.10"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.11.10"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.11.9"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.11.7"),
mockClient.MakeFakeVirtualMachineScaleSetVM("Kubernetes:1.11.10"),
}
}
uc.Force = false
@ -615,7 +615,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
Expect(*uc.UpgradedMasterVMs).To(HaveLen(0))
})
It("Should set platform fault domain count based on availability sets", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
cs.Properties.OrchestratorProfile.KubernetesConfig = &api.KubernetesConfig{}
cs.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = true
uc := UpgradeCluster{
@ -643,7 +643,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should not fail if no managed identity is returned by azure during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
cs.Properties.OrchestratorProfile.KubernetesConfig = &api.KubernetesConfig{}
cs.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity = true
uc := UpgradeCluster{
@ -666,7 +666,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should not fail if a Kubernetes client cannot be created", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
uc := UpgradeCluster{
Translator: &i18n.Translator{},
Logger: log.NewEntry(log.New()),
@ -700,7 +700,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should fail if cluster-autoscaler cannot be paused unless --force is specified", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.12.8", 3, 2, false)
enabled := true
addon := api.KubernetesAddon{
Name: "cluster-autoscaler",
@ -752,7 +752,7 @@ var _ = Describe("Upgrade Kubernetes cluster tests", func() {
})
It("Should pause cluster-autoscaler during upgrade operation", func() {
cs := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.11.10", 3, 2, false)
enabled := true
addon := api.KubernetesAddon{
Name: "cluster-autoscaler",