Skip to content

Commit 723cb86

Browse files
andyzhangxandyzhangx
authored
Merge pull request #61 from csi-driver/cut-off-v0.2.0
chore: cut off v0.2.0 beta release
2 parents a9b116d + fc3c4fc commit 723cb86

11 files changed

+515
-14
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@
77
This driver allows Kubernetes to use [azure-storage-fuse](https://github.com/Azure/azure-storage-fuse), csi plugin name: `blobfuse.csi.azure.com`
88

99
### Project Status
10-
Status: Alpha
10+
Status: Beta
1111

1212
### Container Images & CSI Compatibility:
1313
|Blobfuse CSI Driver Version | Image | v1.0.0 |
1414
|-------------------------------|----------------------------------------------------|--------|
1515
|v0.1.0-alpha |mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.1.0-alpha | yes |
16+
|v0.2.0 |mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.2.0 | yes |
1617
|master branch |mcr.microsoft.com/k8s/csi/blobfuse-csi:latest | yes |
1718

1819
### Kubernetes Compatibility
1920
| Blobfuse CSI Driver\Kubernetes Version | 1.13+ |
2021
|------------------------------------------|-------|
2122
| v0.1.0-alpha | yes |
23+
| v0.2.0 | yes |
2224
| master branch | yes |
2325

2426
### Driver parameters

‎deploy/csi-blobfuse-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- name: socket-dir
6767
mountPath: /csi
6868
- name: blobfuse
69-
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.2.0
69+
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:latest
7070
args:
7171
- "--v=5"
7272
- "--endpoint=$(CSI_ENDPOINT)"

‎deploy/csi-blobfuse-node.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- name: registration-dir
4848
mountPath: /registration
4949
- name: blobfuse
50-
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.2.0
50+
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:latest
5151
args:
5252
- "--v=5"
5353
- "--endpoint=$(CSI_ENDPOINT)"

‎deploy/v0.2.0/crd-csi-driver-registry.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
creationTimestamp: null
5+
name: csidrivers.csi.storage.k8s.io
6+
spec:
7+
group: csi.storage.k8s.io
8+
names:
9+
kind: CSIDriver
10+
plural: csidrivers
11+
scope: Cluster
12+
validation:
13+
openAPIV3Schema:
14+
properties:
15+
spec:
16+
description: Specification of the CSI Driver.
17+
properties:
18+
attachRequired:
19+
description:
20+
Indicates this CSI volume driver requires an attach operation,
21+
and that Kubernetes should call attach and wait for any attach operation
22+
to complete before proceeding to mount.
23+
type: boolean
24+
podInfoOnMountVersion:
25+
description:
26+
Indicates this CSI volume driver requires additional pod
27+
information (like podName, podUID, etc.) during mount operations.
28+
type: string
29+
version: v1alpha1
30+
status:
31+
acceptedNames:
32+
kind: ""
33+
plural: ""
34+
conditions: []
35+
storedVersions: []

‎deploy/v0.2.0/crd-csi-node-info.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
creationTimestamp: null
5+
name: csinodeinfos.csi.storage.k8s.io
6+
spec:
7+
group: csi.storage.k8s.io
8+
names:
9+
kind: CSINodeInfo
10+
plural: csinodeinfos
11+
scope: Cluster
12+
validation:
13+
openAPIV3Schema:
14+
properties:
15+
csiDrivers:
16+
description: List of CSI drivers running on the node and their properties.
17+
items:
18+
properties:
19+
driver:
20+
description: The CSI driver that this object refers to.
21+
type: string
22+
nodeID:
23+
description: The node from the driver point of view.
24+
type: string
25+
topologyKeys:
26+
description: List of keys supported by the driver.
27+
items:
28+
type: string
29+
type: array
30+
type: array
31+
version: v1alpha1
32+
status:
33+
acceptedNames:
34+
kind: ""
35+
plural: ""
36+
conditions: []
37+
storedVersions: []

‎deploy/v0.2.0/csi-blobfuse-controller.yaml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
---
2+
kind: Deployment
3+
apiVersion: apps/v1
4+
metadata:
5+
name: csi-blobfuse-controller
6+
namespace: kube-system
7+
spec:
8+
replicas: 1
9+
selector:
10+
matchLabels:
11+
app: csi-blobfuse-controller
12+
template:
13+
metadata:
14+
labels:
15+
app: csi-blobfuse-controller
16+
spec:
17+
serviceAccountName: csi-blobfuse-controller-sa
18+
nodeSelector:
19+
beta.kubernetes.io/os: linux
20+
containers:
21+
- name: csi-provisioner
22+
image: quay.io/k8scsi/csi-provisioner:v1.0.1
23+
args:
24+
- "--provisioner=blobfuse.csi.azure.com"
25+
- "--csi-address=$(ADDRESS)"
26+
- "--connection-timeout=15s"
27+
env:
28+
- name: ADDRESS
29+
value: /csi/csi.sock
30+
imagePullPolicy: Always
31+
volumeMounts:
32+
- mountPath: /csi
33+
name: socket-dir
34+
- name: csi-attacher
35+
image: quay.io/k8scsi/csi-attacher:v1.0.1
36+
args:
37+
- --v=5
38+
- --csi-address=$(ADDRESS)
39+
- --timeout=120s
40+
env:
41+
- name: ADDRESS
42+
value: /csi/csi.sock
43+
imagePullPolicy: Always
44+
volumeMounts:
45+
- mountPath: /csi
46+
name: socket-dir
47+
- name: cluster-driver-registrar
48+
image: quay.io/k8scsi/csi-cluster-driver-registrar:v1.0.1
49+
args:
50+
- --csi-address=$(ADDRESS)
51+
- --driver-requires-attachment=true
52+
- --v=5
53+
env:
54+
- name: ADDRESS
55+
value: /csi/csi.sock
56+
volumeMounts:
57+
- name: socket-dir
58+
mountPath: /csi
59+
- name: liveness-probe
60+
image: quay.io/k8scsi/livenessprobe:v1.1.0
61+
args:
62+
- --csi-address=/csi/csi.sock
63+
- --connection-timeout=3s
64+
- --health-port=9802
65+
volumeMounts:
66+
- name: socket-dir
67+
mountPath: /csi
68+
- name: blobfuse
69+
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.2.0
70+
args:
71+
- "--v=5"
72+
- "--endpoint=$(CSI_ENDPOINT)"
73+
- "--nodeid=$(KUBE_NODE_NAME)"
74+
ports:
75+
- containerPort: 9802
76+
name: healthz
77+
protocol: TCP
78+
livenessProbe:
79+
failureThreshold: 5
80+
httpGet:
81+
path: /healthz
82+
port: healthz
83+
initialDelaySeconds: 30
84+
timeoutSeconds: 10
85+
periodSeconds: 30
86+
env:
87+
- name: AZURE_CREDENTIAL_FILE
88+
value: "/etc/kubernetes/azure.json"
89+
- name: CSI_ENDPOINT
90+
value: unix:///csi/csi.sock
91+
imagePullPolicy: Always
92+
volumeMounts:
93+
- mountPath: /csi
94+
name: socket-dir
95+
- mountPath: /etc/kubernetes/
96+
name: azure-cred
97+
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
98+
readOnly: true
99+
name: msi
100+
volumes:
101+
- name: socket-dir
102+
emptyDir: {}
103+
- name: azure-cred
104+
hostPath:
105+
path: /etc/kubernetes/
106+
type: Directory
107+
- name: msi
108+
hostPath:
109+
path: /var/lib/waagent/ManagedIdentity-Settings

‎deploy/v0.2.0/csi-blobfuse-node.yaml‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-blobfuse-node
5+
namespace: kube-system
6+
spec:
7+
selector:
8+
matchLabels:
9+
app: csi-blobfuse-node
10+
template:
11+
metadata:
12+
labels:
13+
app: csi-blobfuse-node
14+
spec:
15+
hostNetwork: true
16+
nodeSelector:
17+
beta.kubernetes.io/os: linux
18+
containers:
19+
- name: liveness-probe
20+
imagePullPolicy: Always
21+
volumeMounts:
22+
- mountPath: /csi
23+
name: socket-dir
24+
image: quay.io/k8scsi/livenessprobe:v1.0.2
25+
args:
26+
- --csi-address=/csi/csi.sock
27+
- --connection-timeout=3s
28+
- --health-port=9802
29+
- name: node-driver-registrar
30+
image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
31+
args:
32+
- --csi-address=$(ADDRESS)
33+
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
34+
- --v=5
35+
lifecycle:
36+
preStop:
37+
exec:
38+
command: ["/bin/sh", "-c", "rm -rf /registration/blobfuse.csi.azure.com-reg.sock /csi/csi.sock"]
39+
env:
40+
- name: ADDRESS
41+
value: /csi/csi.sock
42+
- name: DRIVER_REG_SOCK_PATH
43+
value: /var/lib/kubelet/plugins/blobfuse.csi.azure.com/csi.sock
44+
volumeMounts:
45+
- name: socket-dir
46+
mountPath: /csi
47+
- name: registration-dir
48+
mountPath: /registration
49+
- name: blobfuse
50+
image: mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.2.0
51+
args:
52+
- "--v=5"
53+
- "--endpoint=$(CSI_ENDPOINT)"
54+
- "--nodeid=$(KUBE_NODE_NAME)"
55+
ports:
56+
- containerPort: 9802
57+
name: healthz
58+
protocol: TCP
59+
livenessProbe:
60+
failureThreshold: 5
61+
httpGet:
62+
path: /healthz
63+
port: healthz
64+
initialDelaySeconds: 30
65+
timeoutSeconds: 10
66+
periodSeconds: 30
67+
env:
68+
- name: AZURE_CREDENTIAL_FILE
69+
value: "/etc/kubernetes/azure.json"
70+
- name: CSI_ENDPOINT
71+
value: unix:///csi/csi.sock
72+
- name: KUBE_NODE_NAME
73+
valueFrom:
74+
fieldRef:
75+
apiVersion: v1
76+
fieldPath: spec.nodeName
77+
imagePullPolicy: Always
78+
securityContext:
79+
privileged: true
80+
volumeMounts:
81+
- mountPath: /csi
82+
name: socket-dir
83+
- mountPath: /var/lib/kubelet/
84+
mountPropagation: Bidirectional
85+
name: mountpoint-dir
86+
- mountPath: /etc/kubernetes/
87+
name: azure-cred
88+
- mountPath: /var/lib/waagent/ManagedIdentity-Settings
89+
readOnly: true
90+
name: msi
91+
- mountPath: /usr/blob/
92+
name: blobfuse-bin
93+
- mountPath: /mnt
94+
name: blobfuse-cache
95+
volumes:
96+
- hostPath:
97+
path: /var/lib/kubelet/plugins/blobfuse.csi.azure.com
98+
type: DirectoryOrCreate
99+
name: socket-dir
100+
- hostPath:
101+
path: /var/lib/kubelet/
102+
type: DirectoryOrCreate
103+
name: mountpoint-dir
104+
- hostPath:
105+
path: /var/lib/kubelet/plugins_registry/
106+
type: DirectoryOrCreate
107+
name: registration-dir
108+
- hostPath:
109+
path: /etc/kubernetes/
110+
type: Directory
111+
name: azure-cred
112+
- hostPath:
113+
path: /var/lib/waagent/ManagedIdentity-Settings
114+
name: msi
115+
- hostPath:
116+
path: /usr/bin
117+
name: blobfuse-bin
118+
- hostPath:
119+
path: /mnt
120+
name: blobfuse-cache

0 commit comments

Comments
 (0)