diff --git a/docs/book/src/managed/asomanagedcluster.md b/docs/book/src/managed/asomanagedcluster.md index 350da513926..170f38f0005 100644 --- a/docs/book/src/managed/asomanagedcluster.md +++ b/docs/book/src/managed/asomanagedcluster.md @@ -78,7 +78,7 @@ metadata: name: ${CLUSTER_NAME} spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: name: ${CLUSTER_NAME} diff --git a/docs/book/src/managed/managed.md b/docs/book/src/managed/managed.md index f3a24ccf199..c12d09c5850 100644 --- a/docs/book/src/managed/managed.md +++ b/docs/book/src/managed/managed.md @@ -28,7 +28,7 @@ For the complete history of this transition, see the [Managing Azure Resources w ## ASO's AKS versus CAPZ's ASOManaged AKS -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: +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: - 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. - 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/). - 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. diff --git a/main.go b/main.go index 58b97a40e69..343c0e8b0f2 100644 --- a/main.go +++ b/main.go @@ -30,6 +30,7 @@ import ( asocontainerservicev1api20231001 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001" asocontainerservicev1api20231102preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview" asocontainerservicev1api20240402preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240402preview" + asocontainerservicev1api20240901 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20240901" asokubernetesconfigurationv1 "github.com/Azure/azure-service-operator/v2/api/kubernetesconfiguration/v1api20230501" asonetworkv1api20201101 "github.com/Azure/azure-service-operator/v2/api/network/v1api20201101" asonetworkv1api20220701 "github.com/Azure/azure-service-operator/v2/api/network/v1api20220701" @@ -92,6 +93,7 @@ func init() { _ = asocontainerservicev1api20230315preview.AddToScheme(scheme) _ = asocontainerservicev1api20231102preview.AddToScheme(scheme) _ = asocontainerservicev1api20240402preview.AddToScheme(scheme) + _ = asocontainerservicev1api20240901.AddToScheme(scheme) _ = asokubernetesconfigurationv1.AddToScheme(scheme) // +kubebuilder:scaffold:scheme } diff --git a/templates/cluster-template-aks-aso-clusterclass.yaml b/templates/cluster-template-aks-aso-clusterclass.yaml index 5e214ac4575..01dfe6c1492 100644 --- a/templates/cluster-template-aks-aso-clusterclass.yaml +++ b/templates/cluster-template-aks-aso-clusterclass.yaml @@ -44,7 +44,7 @@ spec: template: | version: ${KUBERNETES_VERSION} resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: name: "{{ .builtin.cluster.name }}" @@ -74,7 +74,7 @@ spec: valueFrom: template: | resources: - - apiVersion: "containerservice.azure.com/v1api20231001" + - apiVersion: "containerservice.azure.com/v1api20240901" kind: ManagedClustersAgentPool metadata: name: "{{ .builtin.cluster.name }}-pool0" @@ -102,7 +102,7 @@ spec: valueFrom: template: | resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: name: "{{ .builtin.cluster.name }}-pool1" diff --git a/templates/cluster-template-aks-aso.yaml b/templates/cluster-template-aks-aso.yaml index 29f77594efc..9d1ea7d30a4 100644 --- a/templates/cluster-template-aks-aso.yaml +++ b/templates/cluster-template-aks-aso.yaml @@ -20,7 +20,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: annotations: @@ -82,7 +82,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: annotations: @@ -123,7 +123,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: annotations: diff --git a/templates/flavors/aks-aso-clusterclass/clusterclass.yaml b/templates/flavors/aks-aso-clusterclass/clusterclass.yaml index 4d7c3b6543b..308851b93a1 100644 --- a/templates/flavors/aks-aso-clusterclass/clusterclass.yaml +++ b/templates/flavors/aks-aso-clusterclass/clusterclass.yaml @@ -79,7 +79,7 @@ spec: template: | version: ${KUBERNETES_VERSION} resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: name: "{{ .builtin.cluster.name }}" @@ -111,7 +111,7 @@ spec: valueFrom: template: | resources: - - apiVersion: "containerservice.azure.com/v1api20231001" + - apiVersion: "containerservice.azure.com/v1api20240901" kind: ManagedClustersAgentPool metadata: name: "{{ .builtin.cluster.name }}-pool0" @@ -139,7 +139,7 @@ spec: valueFrom: template: | resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: name: "{{ .builtin.cluster.name }}-pool1" diff --git a/templates/flavors/aks-aso/cluster-template.yaml b/templates/flavors/aks-aso/cluster-template.yaml index f71a8258fb0..6a815ee9d72 100644 --- a/templates/flavors/aks-aso/cluster-template.yaml +++ b/templates/flavors/aks-aso/cluster-template.yaml @@ -21,7 +21,7 @@ metadata: spec: version: ${KUBERNETES_VERSION} resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: name: ${CLUSTER_NAME} @@ -79,7 +79,7 @@ metadata: name: "${CLUSTER_NAME}-pool0" spec: resources: - - apiVersion: "containerservice.azure.com/v1api20231001" + - apiVersion: "containerservice.azure.com/v1api20240901" kind: ManagedClustersAgentPool metadata: name: ${CLUSTER_NAME}-pool0 @@ -118,7 +118,7 @@ metadata: name: "${CLUSTER_NAME}-pool1" spec: resources: - - apiVersion: "containerservice.azure.com/v1api20231001" + - apiVersion: "containerservice.azure.com/v1api20240901" kind: ManagedClustersAgentPool metadata: name: ${CLUSTER_NAME}-pool1 diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml index cfea8653ed4..20feb179abb 100644 --- a/templates/test/ci/cluster-template-prow-aks-aso.yaml +++ b/templates/test/ci/cluster-template-prow-aks-aso.yaml @@ -20,7 +20,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedCluster metadata: annotations: @@ -93,7 +93,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: annotations: @@ -134,7 +134,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: annotations: @@ -175,7 +175,7 @@ metadata: namespace: default spec: resources: - - apiVersion: containerservice.azure.com/v1api20231001 + - apiVersion: containerservice.azure.com/v1api20240901 kind: ManagedClustersAgentPool metadata: annotations: diff --git a/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml b/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml index a12346f24a2..3c9bdc36f33 100644 --- a/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml +++ b/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml @@ -23,7 +23,7 @@ metadata: name: "${CLUSTER_NAME}-pool2" spec: resources: - - apiVersion: "containerservice.azure.com/v1api20231001" + - apiVersion: "containerservice.azure.com/v1api20240901" kind: ManagedClustersAgentPool metadata: name: ${CLUSTER_NAME}-pool2