azure: fix chart bugs after AKS vmType deprecation

Signed-off-by: Jack Francis <[email protected]>
kubernetes · Dec 15, 2023 · a0b0852 · a0b0852
1 parent 5bf33b2
commit a0b0852
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml
@@ -11,4 +11,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.34.0
+version: 9.34.1
diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
@@ -166,11 +166,6 @@ spec:
                 secretKeyRef:
                   key: VMType
                   name: {{ default (include "cluster-autoscaler.fullname" .) .Values.secretKeyRefNameOverride }}
-            - name: AZURE_CLUSTER_NAME
-              valueFrom:
-                secretKeyRef:
-                  key: ClusterName
-                  name: {{ default (include "cluster-autoscaler.fullname" .) .Values.secretKeyRefNameOverride }}
             {{- if .Values.azureUseWorkloadIdentityExtension }}
             - name: ARM_USE_WORKLOAD_IDENTITY_EXTENSION
               value: "true"
@@ -193,11 +188,6 @@ spec:
                 secretKeyRef:
                   key: ClientSecret
                   name: {{ default (include "cluster-autoscaler.fullname" .) .Values.secretKeyRefNameOverride }}
-            - name: AZURE_NODE_RESOURCE_GROUP
-              valueFrom:
-                secretKeyRef:
-                  key: NodeResourceGroup
-                  name: {{ default (include "cluster-autoscaler.fullname" .) .Values.secretKeyRefNameOverride }}
             {{- end }}
           {{- else if eq .Values.cloudProvider "exoscale" }}
             - name: EXOSCALE_API_KEY

diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
@@ -94,7 +94,7 @@ azureUseManagedIdentityExtension: false
 azureUseWorkloadIdentityExtension: false
 
 # azureVMType -- Azure VM type.
-azureVMType: "AKS"
+azureVMType: "vmss"
 
 # cloudConfigPath -- Configuration file for cloud provider.
 cloudConfigPath: ""