Skip to content

Commit

Permalink
Bump AKS version to v1.30.6 #3206 (#3207)
Browse files Browse the repository at this point in the history
  • Loading branch information
BernieWhite authored Dec 10, 2024
1 parent 803b5cc commit 7ac4a4e
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 44 deletions.
3 changes: 3 additions & 0 deletions docs/CHANGELOG-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ See [upgrade notes][1] for helpful information when upgrading from previous vers
What's changed since v1.40.0:

- Updated rules:
- Azure Kubernetes Service:
- Updated `Azure.AKS.Version` to use `1.30.6` as the minimum version by @BernieWhite.
[#3206](https://github.com/Azure/PSRule.Rules.Azure/issues/3206)
- Container Registry:
- Updated documentation and promoted `Azure.ACR.AnonymousAccess` to GA by @BernieWhite.
[#3119](https://github.com/Azure/PSRule.Rules.Azure/issues/3119)
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/about_PSRule_Azure_Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Default:
```yaml
# YAML: The default AZURE_AKS_CLUSTER_MINIMUM_VERSION configuration option
configuration:
AZURE_AKS_CLUSTER_MINIMUM_VERSION: 1.29.7
AZURE_AKS_CLUSTER_MINIMUM_VERSION: 1.30.6
```
Example:
Expand Down
5 changes: 2 additions & 3 deletions docs/en/rules/Azure.AKS.NodeAutoUpgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ For example:
}
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"enableRBAC": true,
"dnsPrefix": "[parameters('dnsPrefix')]",
"agentPoolProfiles": "[variables('allPools')]",
Expand Down Expand Up @@ -137,7 +137,7 @@ resource cluster 'Microsoft.ContainerService/managedClusters@2023-07-01' = {
}
}
properties: {
kubernetesVersion: '1.29.7'
kubernetesVersion: '1.30.6'
enableRBAC: true
dnsPrefix: dnsPrefix
agentPoolProfiles: allPools
Expand Down Expand Up @@ -214,7 +214,6 @@ It's important for you to know when a particular AKS release is hitting your reg
AKS release tracker provides specific component updates present in an AKS version release real time by versions and regions.
It also helps you to identify such fixes shipped to a core add-on, and node image updates for Azure Linux, Ubuntu, and Windows.


## LINKS

- [SE:01-Security Baseline](https://learn.microsoft.com/azure/well-architected/security/establish-baseline)
Expand Down
2 changes: 2 additions & 0 deletions docs/en/rules/Azure.AKS.NodeMinPods.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ resource clusterWithPools 'Microsoft.ContainerService/managedClusters@2023-11-01
}
```

<!-- external:avm avm/res/container-service/managed-cluster agentPools[*].minPods -->

## NOTES

### Rule configuration
Expand Down
4 changes: 2 additions & 2 deletions docs/en/rules/Azure.AKS.PoolVersion.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
severity: Important
pillar: Reliability
category: Design
category: RE:04 Target metrics
resource: Azure Kubernetes Service
online version: https://azure.github.io/PSRule.Rules.Azure/en/rules/Azure.AKS.PoolVersion/
---
Expand All @@ -26,7 +26,7 @@ Consider upgrading node pools to match AKS control plan version.

## LINKS

- [Target and non-functional requirements](https://learn.microsoft.com/azure/architecture/framework/resiliency/design-requirements#meet-application-platform-requirements)
- [RE:04 Target metrics](https://learn.microsoft.com/azure/well-architected/reliability/metrics)
- [Upgrade a cluster control plane with multiple node pools](https://learn.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-cluster-control-plane-with-multiple-node-pools)
- [Supported Kubernetes versions in Azure Kubernetes Service](https://learn.microsoft.com/azure/aks/supported-kubernetes-versions)
- [Azure deployment reference](https://learn.microsoft.com/azure/templates/microsoft.containerservice/managedclusters)
10 changes: 6 additions & 4 deletions docs/en/rules/Azure.AKS.Version.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ For example:
}
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"enableRBAC": true,
"dnsPrefix": "[parameters('dnsPrefix')]",
"agentPoolProfiles": "[variables('allPools')]",
Expand Down Expand Up @@ -145,7 +145,7 @@ resource cluster 'Microsoft.ContainerService/managedClusters@2023-07-01' = {
}
}
properties: {
kubernetesVersion: '1.29.7'
kubernetesVersion: '1.30.6'
enableRBAC: true
dnsPrefix: dnsPrefix
agentPoolProfiles: allPools
Expand Down Expand Up @@ -200,20 +200,22 @@ resource cluster 'Microsoft.ContainerService/managedClusters@2023-07-01' = {
}
```

<!-- external:avm avm/res/container-service/managed-cluster kubernetesVersion -->

### Configure with Azure CLI

```bash
az aks update -n '<name>' -g '<resource_group>' --auto-upgrade-channel 'stable'
```

```bash
az aks upgrade -n '<name>' -g '<resource_group>' --kubernetes-version '1.29.7'
az aks upgrade -n '<name>' -g '<resource_group>' --kubernetes-version '1.30.6'
```

### Configure with Azure PowerShell

```powershell
Set-AzAksCluster -Name '<name>' -ResourceGroupName '<resource_group>' -KubernetesVersion '1.29.7'
Set-AzAksCluster -Name '<name>' -ResourceGroupName '<resource_group>' -KubernetesVersion '1.30.6'
```

## NOTES
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/resources/aks.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ param systemPoolMin int
param systemPoolMax int = 3

@description('The version of Kubernetes.')
param kubernetesVersion string = '1.29.7'
param kubernetesVersion string = '1.30.6'

@description('Maximum number of pods that can run on nodes in the system pool.')
@minValue(30)
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/resources/aks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "2547527017795438682"
"version": "0.31.92.45157",
"templateHash": "6019742219031876579"
}
},
"parameters": {
Expand Down Expand Up @@ -73,7 +73,7 @@
},
"kubernetesVersion": {
"type": "string",
"defaultValue": "1.29.7",
"defaultValue": "1.30.6",
"metadata": {
"description": "The version of Kubernetes."
}
Expand Down
2 changes: 1 addition & 1 deletion docs/setup/configuring-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Default:
```yaml title="ps-rule.yaml"
# YAML: The default AZURE_AKS_CLUSTER_MINIMUM_VERSION configuration option
configuration:
AZURE_AKS_CLUSTER_MINIMUM_VERSION: 1.29.7
AZURE_AKS_CLUSTER_MINIMUM_VERSION: 1.30.6
```
Example:
Expand Down
2 changes: 1 addition & 1 deletion docs/setup/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Use comments to add context.
AZURE_BICEP_MINIMUM_VERSION: '0.28.1'

# Configure the minimum AKS cluster version.
AZURE_AKS_CLUSTER_MINIMUM_VERSION: '1.29.7'
AZURE_AKS_CLUSTER_MINIMUM_VERSION: '1.30.6'

rule:
# Enable custom rules that don't exist in the baseline
Expand Down
2 changes: 1 addition & 1 deletion src/PSRule.Rules.Azure/rules/Config.Rule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
AZURE_BICEP_CHECK_TOOL: false

# Configures minimum AKS cluster version.
AZURE_AKS_CLUSTER_MINIMUM_VERSION: '1.29.7'
AZURE_AKS_CLUSTER_MINIMUM_VERSION: '1.30.6'

# Configures the minimum allowed max pods setting per node pool.
AZURE_AKS_POOL_MINIMUM_MAXPODS: 50
Expand Down
2 changes: 1 addition & 1 deletion tests/PSRule.Rules.Azure.Tests/Azure.AKS.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Describe 'Azure.AKS' -Tag AKS {
$ruleResult.TargetName | Should -BeIn 'cluster-B';

$ruleResult[0].Reason | Should -Not -BeNullOrEmpty;
$ruleResult[0].Reason | Should -BeExactly "Path Properties.kubernetesVersion: The version '1.13.8' does not match the constraint '>=1.29.7'.";
$ruleResult[0].Reason | Should -BeExactly "Path Properties.kubernetesVersion: The version '1.13.8' does not match the constraint '>=1.30.6'.";

# Pass
$ruleResult = @($filteredResult | Where-Object { $_.Outcome -eq 'Pass' });
Expand Down
12 changes: 6 additions & 6 deletions tests/PSRule.Rules.Azure.Tests/Resources.AKS.Template.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"type": "SystemAssigned"
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"dnsPrefix": "[concat('dns-', parameters('clusterName'))]",
"agentPoolProfiles": [
{
Expand Down Expand Up @@ -210,7 +210,7 @@
"type": "SystemAssigned"
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"dnsPrefix": "[concat('dns-', parameters('clusterName'))]",
"agentPoolProfiles": [
{
Expand Down Expand Up @@ -395,7 +395,7 @@
"vnetSubnetID": "[concat(parameters('vnetId'), '/subnets/subnet-03')]",
"maxPods": 50,
"type": "VirtualMachineScaleSets",
"orchestratorVersion": "1.29.7",
"orchestratorVersion": "1.30.6",
"osType": "Linux",
"enableAutoScaling": false
}
Expand Down Expand Up @@ -427,7 +427,7 @@
"type": "SystemAssigned"
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"dnsPrefix": "[concat('dns-', parameters('clusterName'))]",
"agentPoolProfiles": [
{
Expand Down Expand Up @@ -628,7 +628,7 @@
"type": "SystemAssigned"
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"dnsPrefix": "[concat('dns-', parameters('clusterName5'))]",
"agentPoolProfiles": [
{
Expand Down Expand Up @@ -831,7 +831,7 @@
"type": "SystemAssigned"
},
"properties": {
"kubernetesVersion": "1.29.7",
"kubernetesVersion": "1.30.6",
"dnsPrefix": "[concat('dns-', parameters('clusterName6'))]",
"agentPoolProfiles": [
{
Expand Down
Loading

0 comments on commit 7ac4a4e

Please sign in to comment.