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

chore: deprecate support for creating new 1.16 clusters #4256

Merged
merged 3 commits into from
Feb 11, 2021
Merged

chore: deprecate support for creating new 1.16 clusters #4256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f973613
chore: deprecate support for creating new 1.16 clusters
jackfrancis Feb 11, 2021
7556081
remove 1.16 from VHD spec
jackfrancis Feb 11, 2021
fc0eaf6
review feedback
jackfrancis Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaultEnv = [
VALIDATE_CPU_LOAD: false,
] + params

def k8sVersions = ["1.16", "1.17", "1.18", "1.19", "1.20", "1.21"]
def k8sVersions = ["1.17", "1.18", "1.19", "1.20", "1.21"]
def latestReleasedVersion = "1.20"
def tasks = [:]
def testConfigs = []
Expand Down
5 changes: 0 additions & 5 deletions cmd/generate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,11 +577,6 @@ func TestExampleAPIModels(t *testing.T) {
apiModelPath: "../examples/kubernetes-msi-userassigned/kube-vmss.json",
setArgs: defaultSet,
},
{
name: "1.16 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.16.json",
setArgs: defaultSet,
},
{
name: "1.17 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.17.json",
Expand Down
28 changes: 14 additions & 14 deletions cmd/get_logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: "",
windowsScriptPath: "",
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: true,
isSSHEnabled: true,
Expand All @@ -243,7 +243,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: existingFile,
windowsScriptPath: existingFile,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: true,
isSSHEnabled: true,
Expand All @@ -254,7 +254,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: existingFile,
windowsScriptPath: existingFile,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: true,
isSSHEnabled: false,
Expand All @@ -265,7 +265,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: existingFile,
windowsScriptPath: existingFile,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: false,
isSSHEnabled: false,
Expand All @@ -276,7 +276,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: missingFile,
windowsScriptPath: existingFile,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: false,
isSSHEnabled: false,
Expand All @@ -287,7 +287,7 @@ func TestGetLogsInit(t *testing.T) {
glc: &getLogsCmd{
linuxScriptPath: existingFile,
windowsScriptPath: missingFile,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
hasWindows: false,
isSSHEnabled: false,
Expand Down Expand Up @@ -345,7 +345,7 @@ func TestGetLogsGetClusterNodes(t *testing.T) {
{
glc: &getLogsCmd{
controlPlaneOnly: false,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
isWindowsSSHEnabled: true,
nodeList: []string{"k8s-master-22998975-0", "k8s-agentpool1-22998975-0", "windows10"},
Expand All @@ -356,7 +356,7 @@ func TestGetLogsGetClusterNodes(t *testing.T) {
{
glc: &getLogsCmd{
controlPlaneOnly: true,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
isWindowsSSHEnabled: true,
nodeList: []string{"k8s-master-22998975-0", "k8s-agentpool1-22998975-0", "windows10"},
Expand All @@ -367,7 +367,7 @@ func TestGetLogsGetClusterNodes(t *testing.T) {
{
glc: &getLogsCmd{
controlPlaneOnly: false,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
isWindowsSSHEnabled: false,
nodeList: []string{"k8s-master-22998975-0", "k8s-agentpool1-22998975-0", "windows10"},
Expand All @@ -378,7 +378,7 @@ func TestGetLogsGetClusterNodes(t *testing.T) {
{
glc: &getLogsCmd{
controlPlaneOnly: false,
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
},
isWindowsSSHEnabled: true,
nodeList: []string{"k8s-master-22998975-0", "k8s-agentpool1-22998975-0", "windows10"},
Expand Down Expand Up @@ -426,7 +426,7 @@ func TestGetLogsGetClusterNodeScripts(t *testing.T) {
}{
{
glc: &getLogsCmd{
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
linuxVHDScript: linuxVHDScript,
linuxCustomScript: linuxCustomScript,
windowsVHDScript: windowsVHDScript,
Expand All @@ -443,7 +443,7 @@ func TestGetLogsGetClusterNodeScripts(t *testing.T) {
},
{
glc: &getLogsCmd{
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
linuxVHDScript: linuxVHDScript,
linuxCustomScript: linuxCustomScript,
windowsVHDScript: windowsVHDScript,
Expand All @@ -460,7 +460,7 @@ func TestGetLogsGetClusterNodeScripts(t *testing.T) {
},
{
glc: &getLogsCmd{
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
linuxVHDScript: linuxVHDScript,
windowsVHDScript: windowsVHDScript,
},
Expand All @@ -475,7 +475,7 @@ func TestGetLogsGetClusterNodeScripts(t *testing.T) {
},
{
glc: &getLogsCmd{
cs: api.CreateMockContainerService("test", "1.11.11", 1, 1, false),
cs: api.CreateMockContainerService("test", "", 1, 1, false),
linuxVHDScript: linuxVHDScript,
windowsVHDScript: windowsVHDScript,
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/root_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ func TestWriteArtifacts(t *testing.T) {
t.Parallel()
g := NewGomegaWithT(t)

cs := api.CreateMockContainerService("testcluster", "1.16.14", 3, 2, false)
cs := api.CreateMockContainerService("testcluster", "", 3, 2, false)
_, err := cs.SetPropertiesDefaults(api.PropertiesDefaultsParams{
IsScale: false,
IsUpgrade: false,
Expand Down
10 changes: 6 additions & 4 deletions cmd/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package cmd

import (
"fmt"
"testing"

"github.com/Azure/aks-engine/pkg/api/common"
Expand Down Expand Up @@ -150,27 +151,28 @@ func TestCreateUpgradeCommand(t *testing.T) {
}

func TestUpgradeShouldFailForSameVersion(t *testing.T) {
versionToUse := common.RationalizeReleaseAndVersion(api.Kubernetes, "", "", false, false, false)
setupValidVersions(map[string]bool{
"1.10.13": true,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strictly speaking this change wasn't necessary (it didn't traverse the versions allow list flow), but (IMO) it's good practice not to pin to a static version that eventually doesn't make sense (in this case 1.10.13 hasn't made sense for a long time)

versionToUse: true,
})
g := NewGomegaWithT(t)
upgradeCmd := &upgradeCmd{
resourceGroupName: "rg",
apiModelPath: "./not/used",
upgradeVersion: "1.10.13",
upgradeVersion: versionToUse,
location: "centralus",
timeoutInMinutes: 60,
cordonDrainTimeoutInMinutes: 60,

client: &armhelpers.MockAKSEngineClient{},
}

containerServiceMock := api.CreateMockContainerService("testcluster", "1.10.13", 3, 2, false)
containerServiceMock := api.CreateMockContainerService("testcluster", versionToUse, 3, 2, false)
containerServiceMock.Location = "centralus"
upgradeCmd.containerService = containerServiceMock
err := upgradeCmd.initialize()
g.Expect(err).To(HaveOccurred())
g.Expect(err.Error()).To(ContainSubstring("upgrading from Kubernetes version 1.10.13 to version 1.10.13 is not supported"))
g.Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("upgrading from Kubernetes version %s to version %s is not supported", versionToUse, versionToUse)))
resetValidVersions()
}

Expand Down
1 change: 0 additions & 1 deletion examples/addons/csi-secrets-store/kubernetes-csi-secrets-store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"addons": [
{
Expand Down
1 change: 0 additions & 1 deletion examples/addons/nvidia-device-plugin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ This is the [NVIDIA Device Plugin](https://github.com/NVIDIA/k8s-device-plugin)
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"addons": [
{
Expand Down
1 change: 0 additions & 1 deletion examples/customfiles/kubernetes-customfiles-podnodeselector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorVersion": "1.16.14",
"kubernetesConfig": {
"enableRbac" : true,
"enableAggregatedAPIs": true,
Expand Down
1 change: 0 additions & 1 deletion examples/dualstack/kubernetes-iptables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@
}
}
}

3 changes: 0 additions & 3 deletions examples/e2e-tests/kubernetes/gpu-enabled/definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
Expand Down
1 change: 0 additions & 1 deletion examples/e2e-tests/kubernetes/kubernetes-config/addons-enabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"addons": [
{
Expand Down
3 changes: 0 additions & 3 deletions examples/e2e-tests/kubernetes/node-count/50-nodes/definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16"
},
"masterProfile": {
"count": 5,
"dnsPrefix": "",
Expand Down
1 change: 0 additions & 1 deletion examples/e2e-tests/userassignedidentity/vmas/kubernetes-vmas-multimaster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
1 change: 0 additions & 1 deletion examples/e2e-tests/userassignedidentity/vmas/kubernetes-vmas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
1 change: 0 additions & 1 deletion examples/e2e-tests/userassignedidentity/vmss/kubernetes-vmss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true,
"userAssignedID": "aksenginetestid"
Expand Down
1 change: 0 additions & 1 deletion examples/feature-gates/kubernetes-featuresgates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"kubeletConfig" : {
"--feature-gates": "MountPropagation=true,DebugContainers=true"
Expand Down
1 change: 0 additions & 1 deletion examples/ipvs/kubernetes-msi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true,
"kubeProxyMode" : "ipvs"
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-cloud-controller-manager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useCloudControllerManager": true
}
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-containerd-tmpdir.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.17",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got rid of unnecessary version declarations in these configs so we don't have to be annoyed by them in the future

"kubernetesConfig": {
"networkPlugin": "kubenet",
"containerRuntime": "containerd",
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-docker-tmpdir.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.17",
"kubernetesConfig": {
"containerRuntime": "docker",
"containerRuntimeConfig": {
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-keyvault-encryption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"enableEncryptionWithExternalKms": true,
"keyVaultSku": "Premium"
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-kube-reserved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.17",
"kubernetesConfig": {
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true,
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-config/kubernetes-standardlb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"loadBalancerSku": "Standard",
"excludeMasterFromStandardLB": true
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-kubenet-containerd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"networkPlugin": "kubenet",
"containerRuntime": "containerd"
Expand Down
30 changes: 0 additions & 30 deletions examples/kubernetes-releases/kubernetes1.16.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/kubernetes-vmss-spot/kubernetes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true
}
Expand Down
1 change: 0 additions & 1 deletion examples/kubernetes-vmss/kubernetes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.16",
"kubernetesConfig": {
"useManagedIdentity": true
}
Expand Down
Loading