Fix CSI drivers issues on Azure (kubernetes-sigs#9153)

* Include missing azuredisk rbac manifest * Remove missing azure csi manifest * Remove invalid reference mount to waagent settings * Use cloud-config secret instead of /etc/kubernetes/cloud_config file
southbridgeio · Jul 7, 2023 · 0a6e6a7 · 0a6e6a7
1 parent e0a6ecf
commit 0a6e6a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml b/roles/kubernetes-apps/csi_driver/azuredisk/tasks/main.yml
@@ -25,8 +25,8 @@
     - {name: azure-csi-cloud-config-secret, file: azure-csi-cloud-config-secret.yml}
     - {name: azure-csi-azuredisk-controller, file: azure-csi-azuredisk-controller-rbac.yml}
     - {name: azure-csi-azuredisk-controller, file: azure-csi-azuredisk-controller.yml}
+    - {name: azure-csi-azuredisk-node-rbac, file: azure-csi-azuredisk-node-rbac.yml}
     - {name: azure-csi-azuredisk-node, file: azure-csi-azuredisk-node.yml}
-    - {name: azure-csi-node-info-crd.yml.j2, file: azure-csi-node-info-crd.yml}
   register: azure_csi_manifests
   when: inventory_hostname == groups['kube_control_plane'][0]
 

diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2 b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-controller.yml.j2
@@ -165,9 +165,6 @@ spec:
             - mountPath: /etc/kubernetes/
               name: azure-cred
               readOnly: true
-            - mountPath: /var/lib/waagent/ManagedIdentity-Settings
-              readOnly: true
-              name: msi
           resources:
             limits:
               memory: 500Mi

diff --git a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2 b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-node.yml.j2
@@ -150,9 +150,9 @@ spec:
             path: /var/lib/kubelet/plugins_registry/
             type: DirectoryOrCreate
           name: registration-dir
-        - hostPath:
-            path: /etc/kubernetes/
-            type: DirectoryOrCreate
+        - secret:
+            defaultMode: 0644
+            secretName: cloud-config
           name: azure-cred
         - hostPath:
             path: /dev