azure: Use IMDS instead of node labels for azuredisk-csi zone info

Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>

Author: hakman

nodeup/pkg/model/cloudconfig.go

@@ -63,7 +63,9 @@ type CloudConfigBuilder struct {
 var _ fi.NodeupModelBuilder = &CloudConfigBuilder{}
 
 func (b *CloudConfigBuilder) Build(c *fi.NodeupModelBuilderContext) error {
-	if !b.HasAPIServer && b.NodeupConfig.KubeletConfig.CloudProvider == "external" {
+	// Azure worker nodes need azure.json for the azuredisk-csi-driver to query
+	// zone information from IMDS, so we always write it regardless of role.
+	if !b.HasAPIServer && b.NodeupConfig.KubeletConfig.CloudProvider == "external" && b.CloudProvider() != kops.CloudProviderAzure {
 		return nil
 	}
 

tests/integration/update_cluster/minimal_azure/data/azurerm_storage_blob_minimal-azure.example.com-addons-azuredisk-csi-driver.addons.k8s.io-k8s-1.31_source

@@ -642,7 +642,7 @@ spec:
         - --user-agent-suffix=kops
         - --allow-empty-cloud-config=true
         - --support-zone=true
-        - --get-node-info-from-labels=true
+        - --get-node-info-from-labels=false
         - --get-nodeid-from-imds=false
         - --enable-otel-tracing=false
         - --metrics-address=0.0.0.0:29605

tests/integration/update_cluster/minimal_azure/data/azurerm_storage_blob_minimal-azure.example.com-addons-bootstrap_source

@@ -85,7 +85,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.31
     manifest: azuredisk-csi-driver.addons.k8s.io/k8s-1.31.yaml
-    manifestHash: da0ccb52e5db231adbe24c372b9e2e87ea02f9559e80e09b6dbcbc094371220f
+    manifestHash: 83b05a6f607c03094725ec171a8c7b2f073eaafa6830dfcf0b29ad90b728b17b
     name: azuredisk-csi-driver.addons.k8s.io
     prune:
       kinds:

upup/models/cloudup/resources/addons/azuredisk-csi-driver.addons.k8s.io/helm-values.yaml

@@ -6,8 +6,8 @@
 #     --version 1.34.0 --namespace kube-system -f helm-values.yaml > k8s-1.31.yaml.template
 #
 # Note: No kops-specific patches are needed. The driver finds the cloud config
-# at /etc/kubernetes/azure.json (its default path) on control-plane nodes.
-# Node pods use --get-node-info-from-labels and --allow-empty-cloud-config=true.
+# at /etc/kubernetes/azure.json (its default path) on all nodes.
+# Node pods query IMDS for zone info via the cloud config (UseInstanceMetadata: true).
 #
 # Note: StorageClass is managed separately via storage-azure.addons.k8s.io
 
@@ -22,7 +22,6 @@ controller:
 linux:
   enabled: true
   hostNetwork: true
-  getNodeInfoFromLabels: true
 
 node:
   cloudConfigSecretName: ""

upup/models/cloudup/resources/addons/azuredisk-csi-driver.addons.k8s.io/k8s-1.31.yaml.template

@@ -414,7 +414,7 @@ spec:
             - "--user-agent-suffix=kops"
             - "--allow-empty-cloud-config=true"
             - "--support-zone=true"
-            - "--get-node-info-from-labels=true"
+            - "--get-node-info-from-labels=false"
             - "--get-nodeid-from-imds=false"
             - "--enable-otel-tracing=false"
             - "--metrics-address=0.0.0.0:29605"