From 4c5c43a1810accb3f334908ac1d2424147441685 Mon Sep 17 00:00:00 2001 From: David Tesar Date: Sat, 18 May 2024 07:46:13 -0700 Subject: [PATCH 1/5] update readme to use helm --- README.md | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index a3546b2..2623fa2 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,50 @@ This project contains [Helm](https://helm.sh/) charts for [Cluster API](https:// ## Installing CAPI Charts -### [azure-aks-aso](./charts/azure-aks-aso) - -To install an AKS cluster for CAPZ using the ASO API, use the following commands: +This is the foundational step for any cloud provider to install CAPI and then use any charts from this repository: ```shell -clusterctl init --infrastructure azure +helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator helm repo add capi https://mboersma.github.io/cluster-api-charts -helm install capi/azure-aks-aso -f +helm repo add jetstack https://charts.jetstack.io --force-update +helm repo update +helm install \ + cert-manager jetstack/cert-manager \ + --namespace cert-manager \ + --create-namespace \ + --set installCRDs=true ``` -### [azure-managed-cluster](./charts/azure-managed-cluster) +### Azure -To install an AKS cluster for CAPZ as a ManagedCluster, use the following commands: +Use this command to install CAPI with the Azure provider (CAPZ) and all feature flags for any of the Azure charts below. ```shell -clusterctl init --infrastructure azure -helm repo add capi https://mboersma.github.io/cluster-api-charts -helm install capi/azure-managed-cluster -f +helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system \ +--set infrastructure="azure" \ +--set manager.featureGates.core.MachinePool="true" \ +--set manager.featureGates.azure.MachinePool="true" \ +--set manager.featureGates.azure.ASOAPI="true" \ +--set manager.featureGates.azure.ClusterResourceSet="true" \ +--set manager.featureGates.azure.ClusterTopology="true" \ +--set manager.cert-manager.enabled="false" \ +--set manager.cert-manager.installCRDs="false" +``` + +#### [azure-aks-aso](./charts/azure-aks-aso) + +To install an AKS cluster for [CAPZ using the new experimental ASO API](https://capz.sigs.k8s.io/topics/aso.html?highlight=azure%20service%20ope#experimental-aso-api), use the following commands: + +``` +helm install capaksaso capi/azure-aks-aso -f +``` + +#### [azure-managed-cluster](./charts/azure-managed-cluster) + +To install an AKS cluster for CAPZ with [existing v1 ManagedCluster API](https://capz.sigs.k8s.io/topics/managedcluster), use the following commands: + +```shell +helm install azure-managed-cluster capi/azure-managed-cluster -f ``` ## Community, discussion, contribution, and support From c11c043760e4a15e41e2ed57860e97bc3fb75cf8 Mon Sep 17 00:00:00 2001 From: David Tesar Date: Mon, 20 May 2024 11:57:46 -0700 Subject: [PATCH 2/5] address feedback --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2623fa2..490f20a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This project contains [Helm](https://helm.sh/) charts for [Cluster API](https:// ## Installing CAPI Charts -This is the foundational step for any cloud provider to install CAPI and then use any charts from this repository: +These are the first steps for any cloud provider to use the charts from this repository:: ```shell helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator @@ -15,6 +15,7 @@ helm install \ cert-manager jetstack/cert-manager \ --namespace cert-manager \ --create-namespace \ + --version v1.14.5 \ --set installCRDs=true ``` @@ -24,7 +25,7 @@ Use this command to install CAPI with the Azure provider (CAPZ) and all feature ```shell helm install capi-operator capi-operator/cluster-api-operator --create-namespace -n capi-operator-system \ ---set infrastructure="azure" \ +--set infrastructure="azure:v1.15.1" \ --set manager.featureGates.core.MachinePool="true" \ --set manager.featureGates.azure.MachinePool="true" \ --set manager.featureGates.azure.ASOAPI="true" \ @@ -39,7 +40,7 @@ helm install capi-operator capi-operator/cluster-api-operator --create-namespace To install an AKS cluster for [CAPZ using the new experimental ASO API](https://capz.sigs.k8s.io/topics/aso.html?highlight=azure%20service%20ope#experimental-aso-api), use the following commands: ``` -helm install capaksaso capi/azure-aks-aso -f +helm install capz-aso capi/azure-aks-aso -f ``` #### [azure-managed-cluster](./charts/azure-managed-cluster) From 88d2c415731e9e6a2f1a209d286ae2b70e94504a Mon Sep 17 00:00:00 2001 From: David Tesar Date: Thu, 30 May 2024 12:32:58 -0700 Subject: [PATCH 3/5] make default AKS sku smaller --- charts/azure-managed-cluster/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/azure-managed-cluster/values.yaml b/charts/azure-managed-cluster/values.yaml index 822c301..e2a21f2 100644 --- a/charts/azure-managed-cluster/values.yaml +++ b/charts/azure-managed-cluster/values.yaml @@ -111,7 +111,7 @@ defaults: agentPool: mode: User # Note: Only 1 Nodepool of mode System is allowed so we default to User. - sku: Standard_DS4_v2 + sku: Standard_DS2_v2 nodecount: 1 osDiskSizeGB: 32 availabilityZones: From 1ff81fce018addcd967713fa9e171c69359ac04b Mon Sep 17 00:00:00 2001 From: David Tesar Date: Thu, 30 May 2024 12:36:58 -0700 Subject: [PATCH 4/5] add enable preview features --- .../templates/azuremanagedccontrolplane.yaml | 1 + charts/azure-managed-cluster/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/azure-managed-cluster/templates/azuremanagedccontrolplane.yaml b/charts/azure-managed-cluster/templates/azuremanagedccontrolplane.yaml index 561a3d4..7ef9546 100644 --- a/charts/azure-managed-cluster/templates/azuremanagedccontrolplane.yaml +++ b/charts/azure-managed-cluster/templates/azuremanagedccontrolplane.yaml @@ -98,3 +98,4 @@ spec: {{- end }} sku: tier: {{ $.Values.controlplane.sku.tier }} + enablePreviewFeatures: {{ $.Values.controlplane.enablePreviewFeatures }} diff --git a/charts/azure-managed-cluster/values.yaml b/charts/azure-managed-cluster/values.yaml index e2a21f2..4068f2f 100644 --- a/charts/azure-managed-cluster/values.yaml +++ b/charts/azure-managed-cluster/values.yaml @@ -104,6 +104,7 @@ controlplane: dnsPrefix: "" virtualNetwork: {} disableLocalAccounts: false + enablePreviewFeatures: false agentPools: [] From 6406a160ebbfdcda6a09d4567aeff746d83a1835 Mon Sep 17 00:00:00 2001 From: David Tesar Date: Thu, 30 May 2024 12:38:13 -0700 Subject: [PATCH 5/5] bump chart version --- charts/azure-managed-cluster/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/azure-managed-cluster/Chart.yaml b/charts/azure-managed-cluster/Chart.yaml index dbafb91..b819408 100644 --- a/charts/azure-managed-cluster/Chart.yaml +++ b/charts/azure-managed-cluster/Chart.yaml @@ -5,5 +5,5 @@ type: application maintainers: - email: jt572@cornell.edu name: Jont828 -version: 0.2.1 +version: 0.2.3 appVersion: 1.16.0