Skip to content

Commit dbe325e

Browse files
authored
Merge pull request #430 from andyzhangx/fedora
fix: RedHat/CentOS issue in helm installation
2 parents 1985e52 + 6025a68 commit dbe325e

File tree

6 files changed

+53
-13
lines changed

6 files changed

+53
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ Please refer to `blob.csi.azure.com` [driver parameters](./docs/driver-parameter
4040
This option does not depend on cloud provider config file, supports cross subscription and on-premise cluster scenario. Refer to [detailed steps](./deploy/example/e2e_usage.md#option2-bring-your-own-storage-account).
4141
4242
### Install driver on a Kubernetes cluster
43-
- install via [kubectl](./docs/install-blob-csi-driver.md) on public Azure (please use helm for other cloud environments, e.g. Azure Stack)
44-
- install via [helm charts](./charts) on public Azure and Azure Stack
43+
- install via [kubectl](./docs/install-blob-csi-driver.md) on public Azure (please use helm for Azure Stack, RedHat/CentOS)
44+
- install via [helm charts](./charts) on public Azure, Azure Stack, RedHat/CentOS
4545
4646
- (Preview) install [blobfuse-proxy](./pkg/blobfuse-proxy) to make blobfuse mount still available after driver restart
4747

charts/README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ helm repo add blob-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/
1212
helm install blob-csi-driver blob-csi-driver/blob-csi-driver --namespace kube-system
1313
```
1414

15+
### install a specific version
16+
```console
17+
helm repo add blob-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/blob-csi-driver/master/charts
18+
helm install blob-csi-driver blob-csi-driver/blob-csi-driver --namespace kube-system --version v1.1.0
19+
```
20+
1521
## install on Azure Stack
1622
```console
1723
helm install blob-csi-driver blob-csi-driver/blob-csi-driver --namespace kube-system --set cloud=AzureStackCloud
1824
```
1925

20-
### install a specific version
26+
### install on RedHat/CentOS
2127
```console
22-
helm repo add blob-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/blob-csi-driver/master/charts
23-
helm install blob-csi-driver blob-csi-driver/blob-csi-driver --namespace kube-system --version v1.1.0
28+
helm install blob-csi-driver blob-csi-driver/blob-csi-driver --namespace kube-system --set linux.distro=fedora
2429
```
2530

2631
### search for all available chart versions
@@ -99,7 +104,8 @@ The following table lists the configurable parameters of the latest Azure Blob S
99104
| `node.affinity` | node pod affinity | {} |
100105
| `node.nodeSelector` | node pod node selector | {} |
101106
| `node.tolerations` | node pod tolerations | [] |
102-
| `kubelet.linuxPath` | configure the kubelet path for Linux node | `/var/lib/kubelet` |
107+
| `linux.kubelet` | configure kubelet directory path on Linux agent node node | `/var/lib/kubelet` |
108+
| `linux.distro` | configure ssl certificates for different Linux distribution(available values: `debian`, `fedora`) | `debian`
103109
| `cloud` | the cloud environment the driver is running on | AzurePublicCloud |
104110
| `podAnnotations` | collection of annotations to add to all the pods | {} |
105111
| `podLabels` | collection of labels to add to all the pods | {} |
85 Bytes
Binary file not shown.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,14 @@ spec:
127127
mountPath: /etc/ssl/certs
128128
readOnly: true
129129
{{- end }}
130+
{{- if eq .Values.linux.distro "fedora" }}
131+
- name: ssl
132+
mountPath: /etc/ssl/certs
133+
readOnly: true
134+
- name: ssl-pki
135+
mountPath: /etc/pki/ca-trust/extracted
136+
readOnly: true
137+
{{- end }}
130138
resources: {{- toYaml .Values.controller.resources.blob | nindent 12 }}
131139
- name: csi-resizer
132140
image: "{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
@@ -158,6 +166,14 @@ spec:
158166
hostPath:
159167
path: /etc/ssl/certs
160168
{{- end }}
169+
{{- if eq .Values.linux.distro "fedora" }}
170+
- name: ssl
171+
hostPath:
172+
path: /etc/ssl/certs
173+
- name: ssl-pki
174+
hostPath:
175+
path: /etc/pki/ca-trust/extracted
176+
{{- end }}
161177
{{- if .Values.securityContext }}
162178
securityContext: {{- toYaml .Values.securityContext | nindent 8 }}
163179
{{- end }}

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
- name: ADDRESS
7878
value: /csi/csi.sock
7979
- name: DRIVER_REG_SOCK_PATH
80-
value: {{ .Values.kubelet.linuxPath }}/plugins/blob.csi.azure.com/csi.sock
80+
value: {{ .Values.linux.kubelet }}/plugins/blob.csi.azure.com/csi.sock
8181
volumeMounts:
8282
- name: socket-dir
8383
mountPath: /csi
@@ -134,7 +134,7 @@ spec:
134134
volumeMounts:
135135
- mountPath: /csi
136136
name: socket-dir
137-
- mountPath: {{ .Values.kubelet.linuxPath }}/
137+
- mountPath: {{ .Values.linux.kubelet }}/
138138
mountPropagation: Bidirectional
139139
name: mountpoint-dir
140140
- mountPath: /etc/kubernetes/
@@ -149,18 +149,26 @@ spec:
149149
mountPath: /etc/ssl/certs
150150
readOnly: true
151151
{{- end }}
152+
{{- if eq .Values.linux.distro "fedora" }}
153+
- name: ssl
154+
mountPath: /etc/ssl/certs
155+
readOnly: true
156+
- name: ssl-pki
157+
mountPath: /etc/pki/ca-trust/extracted
158+
readOnly: true
159+
{{- end }}
152160
resources: {{- toYaml .Values.node.resources.blob | nindent 12 }}
153161
volumes:
154162
- hostPath:
155-
path: {{ .Values.kubelet.linuxPath }}/plugins/blob.csi.azure.com
163+
path: {{ .Values.linux.kubelet }}/plugins/blob.csi.azure.com
156164
type: DirectoryOrCreate
157165
name: socket-dir
158166
- hostPath:
159-
path: {{ .Values.kubelet.linuxPath }}/
167+
path: {{ .Values.linux.kubelet }}/
160168
type: DirectoryOrCreate
161169
name: mountpoint-dir
162170
- hostPath:
163-
path: {{ .Values.kubelet.linuxPath }}/plugins_registry/
171+
path: {{ .Values.linux.kubelet }}/plugins_registry/
164172
type: DirectoryOrCreate
165173
name: registration-dir
166174
- hostPath:
@@ -178,6 +186,14 @@ spec:
178186
hostPath:
179187
path: /etc/ssl/certs
180188
{{- end }}
189+
{{- if eq .Values.linux.distro "fedora" }}
190+
- name: ssl
191+
hostPath:
192+
path: /etc/ssl/certs
193+
- name: ssl-pki
194+
hostPath:
195+
path: /etc/pki/ca-trust/extracted
196+
{{- end }}
181197
{{- if .Values.securityContext }}
182198
securityContext: {{- toYaml .Values.securityContext | nindent 8 }}
183199
{{- end }}

charts/latest/blob-csi-driver/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ node:
101101
tolerations: []
102102
livenessProbe:
103103
healthPort: 29633
104-
kubelet:
105-
linuxPath: /var/lib/kubelet
104+
105+
linux:
106+
kubelet: /var/lib/kubelet
107+
distro: debian
106108

107109
cloud: AzurePublicCloud
108110

0 commit comments

Comments
 (0)