Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support Kubernetes v1.27.6 #195

Merged
merged 3 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ jobs:
- name: print git status after build
run: |
git status
- name: Validate 1.25 + containerd E2E
- name: Validate 1.26 + containerd E2E
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.25"
ORCHESTRATOR_RELEASE: "1.26"
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand All @@ -100,10 +100,10 @@ jobs:
AZURE_CORE_ONLY_SHOW_ERRORS: true
DISTRO: "aks-ubuntu-20.04"
run: make test-kubernetes
- name: Validate 1.26 + containerd E2E
- name: Validate 1.27 + containerd E2E
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.26"
ORCHESTRATOR_RELEASE: "1.27"
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-cluster-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ on:
required: false
default: ''
kubernetes_release:
description: 'Which Kubernetes release to test (major.minor only, e.g., "1.25")'
description: 'Which Kubernetes release to test (major.minor only, e.g., "1.26")'
required: false
default: '1.25'
default: '1.26'
container_runtime:
description: 'Which CRI to use (e.g., "containerd" or "docker")'
required: false
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
sudo chmod +x /usr/local/bin/k
- name: Build aks-engine-azurestack binary
run: make build-binary
- name: Validate 1.25 scenario, deploy and test suite after deploy
- name: Validate 1.26 scenario, deploy and test suite after deploy
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.25"
ORCHESTRATOR_RELEASE: "1.26"
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand All @@ -85,7 +85,7 @@ jobs:
LINUX_NODE_IMAGE_NAME: ${{vars.LINUX_NODE_IMAGE_NAME}}
LINUX_NODE_IMAGE_VERSION: ${{inputs.LINUX_NODE_IMAGE_VERSION}}
run: make test-kubernetes
- name: Validate 1.25 scenario, upgrade
- name: Validate 1.26 scenario, upgrade
run : |
RESOURCE_GROUP=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2); \
REGION=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2 | cut -d- -f2); \
Expand All @@ -100,17 +100,17 @@ jobs:
--vm-timeout 20 \
--client-id ${{ secrets.TEST_AZURE_SP_ID }} \
--client-secret ${{ secrets.TEST_AZURE_SP_PW }}
- name: Validate 1.25 scenario, remove known hosts
- name: Validate 1.26 scenario, remove known hosts
run : |
RESOURCE_GROUP=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2); \
REGION=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2 | cut -d- -f2); \
CURRENT_VERSION=$(jq -r .properties.orchestratorProfile.orchestratorVersion _output/${RESOURCE_GROUP}/apimodel.json); \
TARGET_VERSION=$(bin/aks-engine-azurestack get-versions | grep -E "^${CURRENT_VERSION}" | xargs | cut -d" " -f2); \
ssh-keygen -f ~/.ssh/known_hosts -R ${RESOURCE_GROUP}.${REGION}.cloudapp.azure.com
- name: Validate 1.25 scenario, test suite after upgrade
- name: Validate 1.26 scenario, test suite after upgrade
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.25"
ORCHESTRATOR_RELEASE: "1.26"
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand All @@ -128,10 +128,10 @@ jobs:
run : |
export NAME=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2);\
make test-kubernetes
- name: Validate 1.26 scenario, deploy and test suite after deploy
- name: Validate 1.27 scenario, deploy and test suite after deploy
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.26"
ORCHESTRATOR_RELEASE: "1.27"
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test-vhd-no-egress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ jobs:
sudo chmod +x /usr/local/bin/k
- name: Build aks-engine-azurestack binary
run: make build-binary
- name: Validate 1.25 no-egress scenario, deploy and test suite after deploy
- name: Validate 1.26 no-egress scenario, deploy and test suite after deploy
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.25"
ORCHESTRATOR_RELEASE: "1.26"
CLUSTER_DEFINITION: "examples/no_outbound.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand All @@ -86,7 +86,7 @@ jobs:
LINUX_NODE_IMAGE_NAME: ${{vars.LINUX_NODE_IMAGE_NAME}}
LINUX_NODE_IMAGE_VERSION: ${{inputs.LINUX_NODE_IMAGE_VERSION}}
run: make test-kubernetes
- name: Validate 1.25 no-egress scenario, upgrade
- name: Validate 1.26 no-egress scenario, upgrade
run : |
RESOURCE_GROUP=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2); \
REGION=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2 | cut -d- -f2); \
Expand All @@ -101,17 +101,17 @@ jobs:
--vm-timeout 20 \
--client-id ${{ secrets.TEST_AZURE_SP_ID }} \
--client-secret ${{ secrets.TEST_AZURE_SP_PW }}
- name: Validate 1.25 no-egress scenario, remove known hosts
- name: Validate 1.26 no-egress scenario, remove known hosts
run : |
RESOURCE_GROUP=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2); \
REGION=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2 | cut -d- -f2); \
CURRENT_VERSION=$(jq -r .properties.orchestratorProfile.orchestratorVersion _output/${RESOURCE_GROUP}/apimodel.json); \
TARGET_VERSION=$(bin/aks-engine-azurestack get-versions | grep -E "^${CURRENT_VERSION}" | xargs | cut -d" " -f2); \
ssh-keygen -f ~/.ssh/known_hosts -R ${RESOURCE_GROUP}.${REGION}.cloudapp.azure.com
- name: Validate 1.25 no-egress scenario, test suite after upgrade
- name: Validate 1.26 no-egress scenario, test suite after upgrade
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.25"
ORCHESTRATOR_RELEASE: "1.26"
CLUSTER_DEFINITION: "examples/no_outbound.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand All @@ -130,10 +130,10 @@ jobs:
run : |
export NAME=$(ls -dt1 _output/* | head -n 1 | cut -d/ -f2);\
make test-kubernetes
- name: Validate 1.26 no-egress scenario, deploy and test suite after deploy
- name: Validate 1.27 no-egress scenario, deploy and test suite after deploy
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
ORCHESTRATOR_RELEASE: "1.26"
ORCHESTRATOR_RELEASE: "1.27"
CLUSTER_DEFINITION: "examples/no_outbound.json"
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
Expand Down
12 changes: 6 additions & 6 deletions .pipelines/pr-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:

- template: e2e-job-template.yaml
parameters:
name: "k8s_1_25_containerd_e2e"
k8sRelease: "1.25"
name: "k8s_1_26_containerd_e2e"
k8sRelease: "1.26"
apimodel: "examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json"
createVNET: false
enableKMSEncryption: false
Expand All @@ -78,8 +78,8 @@ jobs:

- template: e2e-job-template.yaml
parameters:
name: "k8s_1_26_containerd_e2e"
k8sRelease: "1.26"
name: "k8s_1_27_containerd_e2e"
k8sRelease: "1.27"
apimodel: "examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json"
createVNET: false
enableKMSEncryption: false
Expand All @@ -98,8 +98,8 @@ jobs:

- template: e2e-job-template.yaml
parameters:
name: "k8s_1_26_stig_e2e"
k8sRelease: "1.26"
name: "k8s_1_27_stig_e2e"
k8sRelease: "1.27"
apimodel: "examples/e2e-tests/kubernetes/release/default/definition-stig.json"
createVNET: false
enableKMSEncryption: false
Expand Down
8 changes: 4 additions & 4 deletions cmd/generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,13 @@ func TestExampleAPIModels(t *testing.T) {
setArgs: defaultSet,
},
{
name: "1.25 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.25.json",
name: "1.26 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.26.json",
setArgs: defaultSet,
},
{
name: "1.26 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.26.json",
name: "1.27 example",
apiModelPath: "../examples/kubernetes-releases/kubernetes1.27.json",
setArgs: defaultSet,
},
{
Expand Down
30 changes: 30 additions & 0 deletions examples/kubernetes-releases/kubernetes1.27.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.27"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
}
}
}
8 changes: 4 additions & 4 deletions pkg/api/common/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ const (

const (
// KubernetesDefaultRelease is the default Kubernetes release
KubernetesDefaultRelease string = "1.25"
KubernetesDefaultRelease string = "1.26"
// KubernetesDefaultReleaseWindows is the default Kubernetes release for Windows
KubernetesDefaultReleaseWindows string = "1.25"
KubernetesDefaultReleaseWindows string = "1.26"
// KubernetesDefaultReleaseAzureStack is the default Kubernetes release on Azure Stack
KubernetesDefaultReleaseAzureStack string = "1.25"
KubernetesDefaultReleaseAzureStack string = "1.26"
// KubernetesDefaultReleaseWindowsAzureStack is the default Kubernetes release for Windows on Azure Stack
KubernetesDefaultReleaseWindowsAzureStack string = "1.25"
KubernetesDefaultReleaseWindowsAzureStack string = "1.26"
// PodSecurityPolicyRemovedVersion is the first Kubernetes version that does not includes the PSP admission plugin
PodSecurityPolicyRemovedVersion = "1.25.0"
)
Expand Down
9 changes: 6 additions & 3 deletions pkg/api/common/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,11 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.24.9": false,
"1.24.11": false,
"1.25.7": false,
"1.25.13": true,
"1.25.13": false,
"1.26.6": false,
"1.26.8": false,
"1.26.9": true,
"1.27.6": true,
}

// AllKubernetesSupportedVersionsAzureStack is a hash table of all supported Kubernetes version strings on Azure Stack
Expand Down Expand Up @@ -404,10 +405,11 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
"1.24.9": false,
"1.24.11": false,
"1.25.7": false,
"1.25.13": true,
"1.25.13": false,
"1.26.6": false,
"1.26.8": false,
"1.26.9": true,
"1.27.6": true,
}

// AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack
Expand Down Expand Up @@ -448,10 +450,11 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
"1.24.9": false,
"1.24.11": false,
"1.25.7": false,
"1.25.13": true,
"1.25.13": false,
"1.26.6": false,
"1.26.8": false,
"1.26.9": true,
"1.27.6": true,
}

// GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
Expand Down
Loading