Skip to content

Commit dc18c05

Browse files
authored
Merge pull request #154 from andyzhangx/azure-cred-file
feat: use `azure-cred-file` configmap in `kube-system` namespace to specify azure-cred-file path
2 parents 3355d49 + 5a5b3c9 commit dc18c05

File tree

5 files changed

+27
-6
lines changed

5 files changed

+27
-6
lines changed

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ Please refer to `blobfuse.csi.azure.com` [driver parameters](./docs/driver-param
1717
> storage class `blobfuse.csi.azure.com` parameters are compatible with built-in [blobfuse](https://kubernetes.io/docs/concepts/storage/volumes/#blobfuse) plugin
1818
1919
### Prerequisite
20-
- The driver initialization depends on a [Cloud provider config file](https://github.com/kubernetes/cloud-provider-azure/blob/master/docs/cloud-provider-config.md), usually it's `/etc/kubernetes/azure.json` on all kubernetes nodes deployed by [AKS](https://docs.microsoft.com/en-us/azure/aks/) or [aks-engine](https://github.com/Azure/aks-engine), here is an [azure.json example](./deploy/example/azure.json). This driver also supports [read cloud config from kuberenetes secret](./docs/read-from-secret.md).
21-
> if cluster identity is [Managed Service Identity(MSI)](https://docs.microsoft.com/en-us/azure/aks/use-managed-identity), make sure user assigned identity has `Contributor` role on node resource group
20+
- The driver depends on [cloud provider config file](https://github.com/kubernetes/cloud-provider-azure/blob/master/docs/cloud-provider-config.md), usually it's `/etc/kubernetes/azure.json` on all kubernetes nodes deployed by [AKS](https://docs.microsoft.com/en-us/azure/aks/) or [aks-engine](https://github.com/Azure/aks-engine), here is [azure.json example](./deploy/example/azure.json).
21+
> To specify a different cloud provider config file, create `azure-cred-file` configmap before driver installation, e.g. for OpenShift, it's `/etc/kubernetes/cloud.conf` (make sure config file path is in the `volumeMounts.mountPath`)
22+
> ```console
23+
> kubectl create configmap azure-cred-file --from-literal=path="/etc/kubernetes/cloud.conf" --from-literal=path-windows="C:\\k\\cloud.conf" -n kube-system
24+
> ```
25+
- This driver also supports [read cloud config from kuberenetes secret](./docs/read-from-secret.md).
26+
- If cluster identity is [Managed Service Identity(MSI)](https://docs.microsoft.com/en-us/azure/aks/use-managed-identity), make sure user assigned identity has `Contributor` role on node resource group
2227
2328
### Install blobfuse CSI driver on a kubernetes cluster
2429
Please refer to [install blobfuse csi driver](https://github.com/kubernetes-sigs/blobfuse-csi-driver/blob/master/docs/install-blobfuse-csi-driver.md)

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,11 @@ spec:
108108
periodSeconds: 30
109109
env:
110110
- name: AZURE_CREDENTIAL_FILE
111-
value: "/etc/kubernetes/azure.json"
111+
valueFrom:
112+
configMapKeyRef:
113+
name: azure-cred-file
114+
key: path
115+
optional: true
112116
- name: CSI_ENDPOINT
113117
value: unix:///csi/csi.sock
114118
imagePullPolicy: {{ .Values.image.blobfuse.pullPolicy }}

charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-node.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ spec:
9090
periodSeconds: 30
9191
env:
9292
- name: AZURE_CREDENTIAL_FILE
93-
value: "/etc/kubernetes/azure.json"
93+
valueFrom:
94+
configMapKeyRef:
95+
name: azure-cred-file
96+
key: path
97+
optional: true
9498
- name: CSI_ENDPOINT
9599
value: unix:///csi/csi.sock
96100
- name: KUBE_NODE_NAME

deploy/csi-blobfuse-controller.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ spec:
105105
periodSeconds: 30
106106
env:
107107
- name: AZURE_CREDENTIAL_FILE
108-
value: "/etc/kubernetes/azure.json"
108+
valueFrom:
109+
configMapKeyRef:
110+
name: azure-cred-file
111+
key: path
112+
optional: true
109113
- name: CSI_ENDPOINT
110114
value: unix:///csi/csi.sock
111115
volumeMounts:

deploy/csi-blobfuse-node.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ spec:
8989
periodSeconds: 30
9090
env:
9191
- name: AZURE_CREDENTIAL_FILE
92-
value: "/etc/kubernetes/azure.json"
92+
valueFrom:
93+
configMapKeyRef:
94+
name: azure-cred-file
95+
key: path
96+
optional: true
9397
- name: CSI_ENDPOINT
9498
value: unix:///csi/csi.sock
9599
- name: KUBE_NODE_NAME

0 commit comments

Comments
 (0)