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

Commit

Permalink
chore: remove support for Kubernetes 1.13 (#3059)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mboersma
mboersma committed Apr 13, 2020
1 parent 8fb97a2 commit 6026dd2
Show file tree
Hide file tree
Showing 65 changed files with 161 additions and 206 deletions.
5 changes: 0 additions & 5 deletions cmd/generate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,11 +540,6 @@ func TestExampleAPIModels(t *testing.T) {
apiModelPath: "../examples/kubernetes-msi-userassigned/kube-vmss.json",
setArgs: defaultSet,
},
{
name: "1.13 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.13.json",
setArgs: defaultSet,
},
{
name: "1.14 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.14.json",
Expand Down
6 changes: 3 additions & 3 deletions cmd/get_versions_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestGetVersionsCmd_ShouldSupportJSON(t *testing.T) {

command := &getVersionsCmd{
orchestrator: "kubernetes",
version: "1.13.3",
version: "1.15.11",
output: "json",
}
err := command.run(nil, nil)
Expand All @@ -44,7 +44,7 @@ func TestGetVersionsCmd_ShouldBeHumanReadable(t *testing.T) {

command := &getVersionsCmd{
orchestrator: "kubernetes",
version: "1.13.3",
version: "1.15.11",
output: "human",
}
err := command.run(nil, nil)
Expand All @@ -57,7 +57,7 @@ func TestGetVersionsCmd_ShouldErrorIfInvalidOption(t *testing.T) {

command := &getVersionsCmd{
orchestrator: "kubernetes",
version: "1.13.3",
version: "1.15.11",
output: "yaml",
}
err := command.run(nil, nil)
Expand Down
2 changes: 1 addition & 1 deletion cmd/rotate_certs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func TestWriteArtifacts(t *testing.T) {
t.Parallel()

g := NewGomegaWithT(t)
cs := api.CreateMockContainerService("testcluster", "1.13.12", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "1.15.11", 3, 2, false)
_, err := cs.SetPropertiesDefaults(api.PropertiesDefaultsParams{
IsScale: false,
IsUpgrade: false,
Expand Down
2 changes: 1 addition & 1 deletion docs/community/example-launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"id": "kubernetesVersion",
"type": "promptString",
"description": "Kubernetes version:",
"default": "1.13.6"
"default": "1.18.1"
},
{
"id": "location",
Expand Down
2 changes: 1 addition & 1 deletion examples/addons/nvidia-device-plugin/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is the [NVIDIA Device Plugin](https://github.com/NVIDIA/k8s-device-plugin)
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"addons": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/addons/nvidia-device-plugin/nvidia-device-plugin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"addons": [
{
Expand Down
2 changes: 1 addition & 1 deletion examples/customfiles/kubernetes-customfiles-podnodeselector.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorVersion": "1.13.11",
"orchestratorVersion": "1.15.11",
"kubernetesConfig": {
"enableRbac" : true,
"enableAggregatedAPIs": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/kubernetes/gpu-enabled/definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/kubernetes/node-count/50-nodes/definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 5,
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/kubernetes/zones/definition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 5,
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/userassignedidentity/vmas/kubernetes-vmas-multimaster.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease" : "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/userassignedidentity/vmas/kubernetes-vmas.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease" : "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
2 changes: 1 addition & 1 deletion examples/e2e-tests/userassignedidentity/vmss/kubernetes-vmss.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease" : "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
2 changes: 1 addition & 1 deletion examples/feature-gates/kubernetes-featuresgates.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"kubeletConfig" : {
"--feature-gates": "MountPropagation=true,DebugContainers=true"
Expand Down
2 changes: 1 addition & 1 deletion examples/ipvs/kubernetes-msi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true,
"kubeProxyMode" : "ipvs"
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-config/kubernetes-cloud-controller-manager.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useCloudControllerManager": true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-config/kubernetes-keyvault-encryption.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"enableEncryptionWithExternalKms": true,
"keyVaultSku": "Premium"
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-config/kubernetes-standardlb.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-containerd.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"networkPlugin": "flannel",
"containerRuntime": "containerd",
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-kubenet-containerd.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"networkPlugin": "kubenet",
"containerRuntime": "containerd"
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-labels/kubernetes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
Expand Down
35 changes: 0 additions & 35 deletions examples/kubernetes-releases/kubernetes1.13.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/kubernetes-vmss-master/kubernetes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-vmss-master/windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-vmss-spot/kubernetes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-vmss/kubernetes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/largeclusters/kubernetes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"cloudProviderBackoff": true,
"cloudProviderBackoffRetries": 6,
Expand Down
2 changes: 1 addition & 1 deletion examples/managed-identity/kubernetes-msi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"useManagedIdentity": true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple-nodepools/multipool.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13"
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/networkpolicy/kubernetes-antrea.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"networkPolicy": "antrea"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/service-mesh/istio.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"apiServerConfig": {
"--admission-control": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,DenyEscalatingExec,AlwaysPullImages"
Expand Down
2 changes: 1 addition & 1 deletion examples/windows/kubernetes-hyperv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"apiServerConfig" : {
"--feature-gates": "HyperVContainer=true"
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/apiloader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func TestLoadContainerServiceWithEmptyLocationCustomCloud(t *testing.T) {
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"kubernetesImageBase": "msazurestackqa/",
"useInstanceMetadata": false,
Expand Down Expand Up @@ -281,7 +281,7 @@ func TestLoadContainerServiceWithEmptyLocationCustomCloud(t *testing.T) {
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.13",
"orchestratorRelease": "1.15",
"kubernetesConfig": {
"kubernetesImageBase": "msazurestackqa/",
"useInstanceMetadata": false,
Expand Down Expand Up @@ -430,7 +430,7 @@ func TestLoadContainerServiceForAgentPoolOnlyClusterWithRawJSON(t *testing.T) {
Translator: &i18n.Translator{},
}

cs, _, err := apiloader.LoadContainerServiceForAgentPoolOnlyCluster(rawJSON, v20170831.APIVersion, true, false, "1.13.11", nil)
cs, _, err := apiloader.LoadContainerServiceForAgentPoolOnlyCluster(rawJSON, v20170831.APIVersion, true, false, "1.15.11", nil)

if err != nil {
t.Errorf("unexpected error while executing LoadContainerServiceForAgentPoolOnlyCluster: %s", err.Error())
Expand All @@ -456,7 +456,7 @@ func TestLoadContainerServiceForAgentPoolOnlyClusterWithRawJSON(t *testing.T) {
rawJSON20180331 := []byte(`{"id":"sampleID","location":"westus2","plan":{"name":"sampleRPPlan","product":"fooProduct","promotionCode":"barPromoCode","publisher":"bazPublisher"},"tags":{"123":"456","abc":"def"},"type":"sampleType","properties":{"provisioningState":"Succeeded","kubernetesVersion":"","dnsPrefix":"blueorange","fqdn":"blueorange.azure.com","agentPoolProfiles":[{"name":"sampleagent","count":0,"vmSize":"Standard_DS1_v1","osDiskSizeGB":512,"storageProfile":"ManagedDisks","vnetSubnetID":"/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/sampleVnet/subnets/sampleVnetSubnetID","osType":"Linux"}],"windowsProfile":{"adminUsername":"azureuser","adminPassword":"azurepassword"},"servicePrincipalProfile":{"clientId":"sampleClientID","secret":"sampleSecret"}}}`)

//Test with version v20180331
cs, _, err = apiloader.LoadContainerServiceForAgentPoolOnlyCluster(rawJSON20180331, v20180331.APIVersion, true, false, "1.13.11", nil)
cs, _, err = apiloader.LoadContainerServiceForAgentPoolOnlyCluster(rawJSON20180331, v20180331.APIVersion, true, false, "1.15.11", nil)

if err != nil {
t.Errorf("unexpected error while executing LoadContainerServiceForAgentPoolOnlyCluster: %s", err.Error())
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/common/versions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.13.8": false,
"1.13.9": false,
"1.13.10": false,
"1.13.11": true,
"1.13.11": false,
"1.13.12": false, // disabled because of https://github.com/Azure/aks-engine/issues/2312
"1.14.0-alpha.1": false,
"1.14.0-alpha.2": false,
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/convertertoagentpoolonlyapi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

func TestConvertV20180331AgentPoolOnlyOrchestratorProfile(t *testing.T) {
kubernetesVersion := "1.13.11"
kubernetesVersion := "1.15.11"
networkPlugin := v20180331.Azure
networkPolicy := v20180331.NetworkPolicyCalico
networkPluginKubenet := v20180331.Kubenet
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/defaults-kubelet_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func TestKubeletConfigAzureStackDefaults(t *testing.T) {
}

func TestKubeletConfigDefaultsRemovals(t *testing.T) {
cs := CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.13", "", false, false), 3, 2, false)
cs := CreateMockContainerService("testcluster", common.RationalizeReleaseAndVersion(Kubernetes, "1.15", "", false, false), 3, 2, false)
poolProfile := &AgentPoolProfile{}
poolProfile.Count = 1
poolProfile.Name = "agentpool2"
Expand Down

0 comments on commit 6026dd2

Please sign in to comment.