Add enable preview features, update default SKU (#18)

mboersma · Jun 3, 2024 · 1bbc20c · 1bbc20c
1 parent b1cc76a
commit 1bbc20c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -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" \

diff --git a/charts/azure-managed-cluster/Chart.yaml b/charts/azure-managed-cluster/Chart.yaml
@@ -5,5 +5,5 @@ type: application
 maintainers:
 - email: [email protected]
   name: Jont828
-version: 0.2.2
+version: 0.2.3
 appVersion: 1.16.0
diff --git 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
@@ -104,14 +104,15 @@ controlplane:
   dnsPrefix: ""
   virtualNetwork: {}
   disableLocalAccounts: false
+  enablePreviewFeatures: false
 
 agentPools: []
 
 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: