Skip to content

Commit 99a359a

Browse files
authored
Merge pull request #5626 from k8s-infra-cherrypick-robot/cherry-pick-5622-to-release-1.19
[release-1.19] Enable new AKS API version with ASO API
2 parents 76b44f5 + a84c90e commit 99a359a

File tree

9 files changed

+21
-19
lines changed

9 files changed

+21
-19
lines changed

docs/book/src/managed/asomanagedcluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ metadata:
7878
name: ${CLUSTER_NAME}
7979
spec:
8080
resources:
81-
- apiVersion: containerservice.azure.com/v1api20231001
81+
- apiVersion: containerservice.azure.com/v1api20240901
8282
kind: ManagedCluster
8383
metadata:
8484
name: ${CLUSTER_NAME}

docs/book/src/managed/managed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For the complete history of this transition, see the [Managing Azure Resources w
2828

2929
## ASO's AKS versus CAPZ's ASOManaged AKS
3030

31-
It is possible to not utilize CAPZ at all and simply utilize ASO to provision an [AKS cluster definition directly](https://azure.github.io/azure-service-operator/reference/containerservice/v1api20231001/#containerservice.azure.com/v1api20231001.ManagedCluster). The advantages that CAPZ brings over this approach are the following:
31+
It is possible to not utilize CAPZ at all and simply utilize ASO to provision an [AKS cluster definition directly](https://azure.github.io/azure-service-operator/reference/containerservice/v1api20231001/#containerservice.azure.com/v1api20240901.ManagedCluster). The advantages that CAPZ brings over this approach are the following:
3232
- Robust Testing - CAPZ is utilized to test Kubernetes and AKS using this code with numerous end-to-end tests. ASO has no AKS-specific testing.
3333
- Simplification of Infrastructure as Code (IaC) definitions - With ASO you have to figure out how to put together every field and there are some small examples. CAPZ provides `kustomize` template samples connected to `clusterctl generate template` as well as a [helm chart](https://github.com/mboersma/cluster-api-charts/).
3434
- Management scale - CAPZ enables use of [ClusterClass](../topics/clusterclass.md) so you can have a smaller chunk of code to manage numerous clusters with the same configuration.

main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
asocontainerservicev1api20231001 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
3131
asocontainerservicev1api20231102preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
3232
asocontainerservicev1api20240402preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240402preview"
33+
asocontainerservicev1api20240901 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901"
3334
asokubernetesconfigurationv1 "github.com/Azure/azure-service-operator/v2/api/kubernetesconfiguration/v1api20230501"
3435
asonetworkv1api20201101 "github.com/Azure/azure-service-operator/v2/api/network/v1api20201101"
3536
asonetworkv1api20220701 "github.com/Azure/azure-service-operator/v2/api/network/v1api20220701"
@@ -92,6 +93,7 @@ func init() {
9293
_ = asocontainerservicev1api20230315preview.AddToScheme(scheme)
9394
_ = asocontainerservicev1api20231102preview.AddToScheme(scheme)
9495
_ = asocontainerservicev1api20240402preview.AddToScheme(scheme)
96+
_ = asocontainerservicev1api20240901.AddToScheme(scheme)
9597
_ = asokubernetesconfigurationv1.AddToScheme(scheme)
9698
// +kubebuilder:scaffold:scheme
9799
}

templates/cluster-template-aks-aso-clusterclass.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/cluster-template-aks-aso.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/flavors/aks-aso-clusterclass/clusterclass.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
template: |
8080
version: ${KUBERNETES_VERSION}
8181
resources:
82-
- apiVersion: containerservice.azure.com/v1api20231001
82+
- apiVersion: containerservice.azure.com/v1api20240901
8383
kind: ManagedCluster
8484
metadata:
8585
name: "{{ .builtin.cluster.name }}"
@@ -111,7 +111,7 @@ spec:
111111
valueFrom:
112112
template: |
113113
resources:
114-
- apiVersion: "containerservice.azure.com/v1api20231001"
114+
- apiVersion: "containerservice.azure.com/v1api20240901"
115115
kind: ManagedClustersAgentPool
116116
metadata:
117117
name: "{{ .builtin.cluster.name }}-pool0"
@@ -139,7 +139,7 @@ spec:
139139
valueFrom:
140140
template: |
141141
resources:
142-
- apiVersion: containerservice.azure.com/v1api20231001
142+
- apiVersion: containerservice.azure.com/v1api20240901
143143
kind: ManagedClustersAgentPool
144144
metadata:
145145
name: "{{ .builtin.cluster.name }}-pool1"

templates/flavors/aks-aso/cluster-template.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ metadata:
2121
spec:
2222
version: ${KUBERNETES_VERSION}
2323
resources:
24-
- apiVersion: containerservice.azure.com/v1api20231001
24+
- apiVersion: containerservice.azure.com/v1api20240901
2525
kind: ManagedCluster
2626
metadata:
2727
name: ${CLUSTER_NAME}
@@ -79,7 +79,7 @@ metadata:
7979
name: "${CLUSTER_NAME}-pool0"
8080
spec:
8181
resources:
82-
- apiVersion: "containerservice.azure.com/v1api20231001"
82+
- apiVersion: "containerservice.azure.com/v1api20240901"
8383
kind: ManagedClustersAgentPool
8484
metadata:
8585
name: ${CLUSTER_NAME}-pool0
@@ -118,7 +118,7 @@ metadata:
118118
name: "${CLUSTER_NAME}-pool1"
119119
spec:
120120
resources:
121-
- apiVersion: "containerservice.azure.com/v1api20231001"
121+
- apiVersion: "containerservice.azure.com/v1api20240901"
122122
kind: ManagedClustersAgentPool
123123
metadata:
124124
name: ${CLUSTER_NAME}-pool1

templates/test/ci/cluster-template-prow-aks-aso.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ metadata:
2323
name: "${CLUSTER_NAME}-pool2"
2424
spec:
2525
resources:
26-
- apiVersion: "containerservice.azure.com/v1api20231001"
26+
- apiVersion: "containerservice.azure.com/v1api20240901"
2727
kind: ManagedClustersAgentPool
2828
metadata:
2929
name: ${CLUSTER_NAME}-pool2

0 commit comments

Comments
 (0)