Skip to content

Commit 5129f76

Browse files
ks-ci-botks-ci-bot
authored
Merge pull request #229 from zwwhdls/update_chart
Upgrade juicefs chart to v0.13.2
2 parents 8f61b8e + 46e415a commit 5129f76

File tree

7 files changed

+109
-39
lines changed

7 files changed

+109
-39
lines changed

‎src/stable/juicefs/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: juicefs
33
description: A Helm chart for JuiceFS CSI Driver
44
type: application
5-
version: 0.7.0
6-
appVersion: 0.11.0
5+
version: 0.9.2
6+
appVersion: 0.13.2
77
kubeVersion: ">=1.14.0-0"
88
home: https://github.com/juicedata/juicefs
99
sources:

‎src/stable/juicefs/README.md

+32-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# juicefs-csi-driver
22

3-
![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.11.0](https://img.shields.io/badge/AppVersion-0.11.0-informational?style=flat-square)
3+
![Version: 0.9.2](https://img.shields.io/badge/Version-0.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.2](https://img.shields.io/badge/AppVersion-0.13.2-informational?style=flat-square)
44

55
A Helm chart for JuiceFS CSI Driver
66

@@ -16,40 +16,38 @@ Kubernetes: `>=1.14.0-0`
1616

1717
## Values
1818

19-
| Key | Type | Default | Description |
20-
|-----|------|---------|-------------|
21-
| controller.affinity | object | Hard node and soft zone anti-affinity | Affinity for controller pods. |
22-
| controller.enabled | bool | `true` | |
23-
| controller.nodeSelector | object | `{}` | Node selector for controller pods |
24-
| controller.replicas | int | `1` | |
25-
| controller.resources.limits.cpu | string | `"1000m"` | |
26-
| controller.resources.limits.memory | string | `"1Gi"` | |
27-
| controller.resources.requests.cpu | string | `"100m"` | |
28-
| controller.resources.requests.memory | string | `"512Mi"` | |
29-
| controller.service.port | int | `9909` | |
30-
| controller.service.trpe | string | `"ClusterIP"` | |
31-
| controller.terminationGracePeriodSeconds | int | `30` | Grace period to allow the controller to shutdown before it is killed |
19+
| Key | Type | Default | Description |
20+
|-----|------|------------------------------------------------------|-------------|
21+
| controller.affinity | object | Hard node and soft zone anti-affinity | Affinity for controller pods. |
22+
| controller.enabled | bool | `true` | |
23+
| controller.nodeSelector | object | `{}` | Node selector for controller pods |
24+
| controller.replicas | int | `1` | |
25+
| controller.resources.limits.cpu | string | `"1000m"` | |
26+
| controller.resources.limits.memory | string | `"1Gi"` | |
27+
| controller.resources.requests.cpu | string | `"100m"` | |
28+
| controller.resources.requests.memory | string | `"512Mi"` | |
29+
| controller.service.port | int | `9909` | |
30+
| controller.service.trpe | string | `"ClusterIP"` | |
31+
| controller.terminationGracePeriodSeconds | int | `30` | Grace period to allow the controller to shutdown before it is killed |
3232
| controller.tolerations | list | `[{"key":"CriticalAddonsOnly","operator":"Exists"}]` | Tolerations for controller pods |
33-
| dnsConfig | object | `{}` | |
34-
| dnsPolicy | string | `"ClusterFirstWithHostNet"` | |
35-
| hostAliases | list | `[]` | |
36-
| image.pullPolicy | string | `""` | |
37-
| image.repository | string | `"juicedata/juicefs-csi-driver"` | |
38-
| image.tag | string | `"v0.10.5"` | |
39-
| jfsConfigDir | string | `"/var/lib/juicefs/config"` | |
40-
| jfsMountDir | string | `"/var/lib/juicefs/volume"` | juicefs mount dir |
41-
| jfsMountPriority | object | `{"enable":true,"name":"juicefs-mount-critical"}` | juicefs mount pod priority |
42-
| kubeletDir | string | `"/var/lib/kubelet"` | kubelet working directory,can be set using `--root-dir` when starting kubelet |
43-
| namespace | string | `"kube-system"` | |
44-
| node.affinity | object | Hard node and soft zone anti-affinity | Affinity for node pods. |
45-
| node.enabled | bool | `true` | |
46-
| node.hostNetwork | bool | `false` | |
47-
| node.nodeSelector | object | `{}` | Node selector for node pods |
48-
| node.resources.limits.cpu | string | `"2000m"` | |
49-
| node.resources.limits.memory | string | `"5Gi"` | |
50-
| node.resources.requests.cpu | string | `"1000m"` | |
51-
| node.resources.requests.memory | string | `"1Gi"` | |
52-
| node.terminationGracePeriodSeconds | int | `30` | Grace period to allow the node pod to shutdown before it is killed |
33+
| dnsConfig | object | `{}` | |
34+
| dnsPolicy | string | `"ClusterFirstWithHostNet"` | |
35+
| hostAliases | list | `[]` | |
36+
| image.pullPolicy | string | `""` | |
37+
| image.repository | string | `"juicedata/juicefs-csi-driver"` | |
38+
| image.tag | string | `"v0.13.2"` | |
39+
| jfsConfigDir | string | `"/var/lib/juicefs/config"` | |
40+
| jfsMountDir | string | `"/var/lib/juicefs/volume"` | juicefs mount dir |
41+
| kubeletDir | string | `"/var/lib/kubelet"` | kubelet working directory,can be set using `--root-dir` when starting kubelet |
42+
| node.affinity | object | Hard node and soft zone anti-affinity | Affinity for node pods. |
43+
| node.enabled | bool | `true` | |
44+
| node.hostNetwork | bool | `false` | |
45+
| node.nodeSelector | object | `{}` | Node selector for node pods |
46+
| node.resources.limits.cpu | string | `"2000m"` | |
47+
| node.resources.limits.memory | string | `"5Gi"` | |
48+
| node.resources.requests.cpu | string | `"1000m"` | |
49+
| node.resources.requests.memory | string | `"1Gi"` | |
50+
| node.terminationGracePeriodSeconds | int | `30` | Grace period to allow the node pod to shutdown before it is killed |
5351
| node.tolerations | list | `[{"key":"CriticalAddonsOnly","operator":"Exists"}]` | Tolerations for node pods |
5452
| serviceAccount.controller.annotations | object | `{}` | |
5553
| serviceAccount.controller.create | bool | `true` | |

‎src/stable/juicefs/templates/controller.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
args:
3434
- --endpoint=$(CSI_ENDPOINT)
3535
- --logtostderr
36-
- --nodeid=$(NODE_ID)
36+
- --nodeid=$(NODE_NAME)
3737
- --v=5
3838
env:
3939
- name: CSI_ENDPOINT

‎src/stable/juicefs/templates/daemonset.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
args:
3232
- --endpoint=$(CSI_ENDPOINT)
3333
- --logtostderr
34-
- --nodeid=$(NODE_ID)
34+
- --nodeid=$(NODE_NAME)
3535
- --v=5
3636
- --enable-manager=true
3737
env:
@@ -49,6 +49,12 @@ spec:
4949
valueFrom:
5050
fieldRef:
5151
fieldPath: metadata.name
52+
- name: HOST_IP
53+
valueFrom:
54+
fieldRef:
55+
fieldPath: status.hostIP
56+
- name: KUBELET_PORT
57+
value: "10250"
5258
- name: JUICEFS_MOUNT_PATH
5359
value: {{ .Values.jfsMountDir }}
5460
- name: JUICEFS_CONFIG_PATH

‎src/stable/juicefs/templates/serviceaccount.yaml

+47
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ rules:
6060
- ""
6161
resources:
6262
- pods
63+
- pods/log
6364
verbs:
6465
- get
6566
- list
@@ -91,6 +92,22 @@ rules:
9192
verbs:
9293
- get
9394
- list
95+
- create
96+
- update
97+
- patch
98+
- delete
99+
- apiGroups:
100+
- batch
101+
resources:
102+
- jobs
103+
verbs:
104+
- get
105+
- list
106+
- create
107+
- update
108+
- delete
109+
- patch
110+
- watch
94111
---
95112
apiVersion: rbac.authorization.k8s.io/v1
96113
kind: ClusterRoleBinding
@@ -139,6 +156,36 @@ rules:
139156
- ""
140157
resources:
141158
- pods
159+
- pods/log
160+
verbs:
161+
- get
162+
- list
163+
- create
164+
- update
165+
- delete
166+
- patch
167+
- watch
168+
- apiGroups:
169+
- ""
170+
resources:
171+
- nodes/proxy
172+
verbs:
173+
- '*'
174+
- apiGroups:
175+
- ""
176+
resources:
177+
- secrets
178+
verbs:
179+
- get
180+
- list
181+
- create
182+
- update
183+
- patch
184+
- delete
185+
- apiGroups:
186+
- batch
187+
resources:
188+
- jobs
142189
verbs:
143190
- get
144191
- list

‎src/stable/juicefs/templates/storageclass.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ data:
2626
{{- if .bucket }}
2727
bucket: {{ .bucket | b64enc | quote }}
2828
{{- end }}
29+
{{- if .envs }}
30+
envs: {{ .envs | b64enc | quote }}
31+
{{- end }}
32+
{{- if .configs }}
33+
configs: {{ .configs | b64enc | quote }}
34+
{{- end }}
35+
{{- if .trashDays }}
36+
trash-days: {{ .trashDays | b64enc | quote }}
37+
{{- end }}
2938
{{- end }}
3039
---
3140
apiVersion: storage.k8s.io/v1

‎src/stable/juicefs/values.yaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
image:
1111
repository: juicedata/juicefs-csi-driver
12-
tag: "v0.11.0"
12+
tag: "v0.13.2"
1313
pullPolicy: ""
1414

1515
sidecars:
@@ -134,10 +134,20 @@ storageClasses:
134134
secretKey: ""
135135
# -- Bucket URL. Read [this document](https://github.com/juicedata/juicefs/blob/main/docs/en/how_to_setup_object_storage.md) to learn how to setup different object storage.
136136
bucket: ""
137+
# -- Env for mount pod and format, such as `a: b`
138+
envs: ""
139+
# -- Config for mount pod. Read [this document](https://github.com/juicedata/juicefs-csi-driver/blob/master/docs/en/examples/config-and-env.md) for more usage.
140+
configs: ""
141+
# -- Config for trash days
142+
trashDays: ""
137143

138144

139145
mountOptions:
140146
# -- Mount Options. Read [this document](https://github.com/juicedata/juicefs/blob/main/docs/en/command_reference.md#juicefs-mount) to learn how to set different mount options.
147+
# Example:
148+
# - debug
149+
# - cache-size=2048
150+
# - cache-dir=/var/foo
141151

142152
mountPod:
143153
# mount pod resource requests & limits

0 commit comments

Comments
 (0)