Skip to content

Commit fb399b7

Browse files
hhhhsc701hhhhsc701
authored
feature: pvc支持本地盘+配置sc (#104)
1 parent c1352ab commit fb399b7

File tree

6 files changed

+273
-5
lines changed

6 files changed

+273
-5
lines changed

‎deployment/helm/datamate/charts/public/templates/database-pvc.yaml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }}
2+
apiVersion: v1
3+
kind: PersistentVolume
4+
metadata:
5+
name: {{ .Values.global.namespace | default "datamate" }}-database-pv
6+
spec:
7+
capacity:
8+
storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }}
9+
volumeMode: Filesystem
10+
accessModes:
11+
- {{ .Values.persistentVolumeClaim.accessModes }}
12+
persistentVolumeReclaimPolicy: Delete
13+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
14+
local: # local类型
15+
path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/database
16+
claimRef:
17+
apiVersion: v1
18+
kind: PersistentVolumeClaim
19+
name: datamate-database-pvc
20+
namespace: {{ .Values.global.namespace | default "datamate" }}
21+
nodeAffinity:
22+
required:
23+
nodeSelectorTerms:
24+
- matchExpressions:
25+
- key: kubernetes.io/hostname
26+
operator: In
27+
values:
28+
- {{ .Values.persistentVolumeClaim.storageNode }}
29+
30+
---
31+
apiVersion: v1
32+
kind: PersistentVolumeClaim
33+
metadata:
34+
name: datamate-database-pvc
35+
{{- with .Values.annotations }}
36+
annotations:
37+
{{- toYaml . | indent 4 }}
38+
{{- end }}
39+
labels:
40+
{{- include "public.labels" . | nindent 4 }}
41+
spec:
42+
accessModes:
43+
- {{ .Values.persistentVolumeClaim.accessModes }}
44+
volumeName: {{ .Values.global.namespace | default "datamate" }}-database-pv
45+
volumeMode: Filesystem
46+
resources:
47+
requests:
48+
storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }}
49+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
50+
51+
{{- else }}
52+
153
apiVersion: v1
254
kind: PersistentVolumeClaim
355
metadata:
@@ -16,4 +68,5 @@ spec:
1668
{{- end }}
1769
resources:
1870
requests:
19-
storage: {{ .Values.persistentVolumeClaim.size.database }}
71+
storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }}
72+
{{- end }}

‎deployment/helm/datamate/charts/public/templates/dataset-pvc.yaml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }}
2+
apiVersion: v1
3+
kind: PersistentVolume
4+
metadata:
5+
name: {{ .Values.global.namespace | default "datamate" }}-dataset-pv
6+
spec:
7+
capacity:
8+
storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }}
9+
volumeMode: Filesystem
10+
accessModes:
11+
- {{ .Values.persistentVolumeClaim.accessModes }}
12+
persistentVolumeReclaimPolicy: Delete
13+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
14+
local: # local类型
15+
path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/dataset
16+
claimRef:
17+
apiVersion: v1
18+
kind: PersistentVolumeClaim
19+
name: datamate-dataset-pvc
20+
namespace: {{ .Values.global.namespace | default "datamate" }}
21+
nodeAffinity:
22+
required:
23+
nodeSelectorTerms:
24+
- matchExpressions:
25+
- key: kubernetes.io/hostname
26+
operator: In
27+
values:
28+
- {{ .Values.persistentVolumeClaim.storageNode }}
29+
30+
---
31+
apiVersion: v1
32+
kind: PersistentVolumeClaim
33+
metadata:
34+
name: datamate-dataset-pvc
35+
{{- with .Values.annotations }}
36+
annotations:
37+
{{- toYaml . | indent 4 }}
38+
{{- end }}
39+
labels:
40+
{{- include "public.labels" . | nindent 4 }}
41+
spec:
42+
accessModes:
43+
- {{ .Values.persistentVolumeClaim.accessModes }}
44+
volumeName: {{ .Values.global.namespace | default "datamate" }}-dataset-pv
45+
volumeMode: Filesystem
46+
resources:
47+
requests:
48+
storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }}
49+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
50+
51+
{{- else }}
52+
153
apiVersion: v1
254
kind: PersistentVolumeClaim
355
metadata:
@@ -16,4 +68,5 @@ spec:
1668
{{- end }}
1769
resources:
1870
requests:
19-
storage: {{ .Values.persistentVolumeClaim.size.dataset }}
71+
storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }}
72+
{{- end }}

‎deployment/helm/datamate/charts/public/templates/flow-pvc.yaml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }}
2+
apiVersion: v1
3+
kind: PersistentVolume
4+
metadata:
5+
name: {{ .Values.global.namespace | default "datamate" }}-flow-pv
6+
spec:
7+
capacity:
8+
storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }}
9+
volumeMode: Filesystem
10+
accessModes:
11+
- {{ .Values.persistentVolumeClaim.accessModes }}
12+
persistentVolumeReclaimPolicy: Delete
13+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
14+
local: # local类型
15+
path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/flow
16+
claimRef:
17+
apiVersion: v1
18+
kind: PersistentVolumeClaim
19+
name: datamate-flow-pvc
20+
namespace: {{ .Values.global.namespace | default "datamate" }}
21+
nodeAffinity:
22+
required:
23+
nodeSelectorTerms:
24+
- matchExpressions:
25+
- key: kubernetes.io/hostname
26+
operator: In
27+
values:
28+
- {{ .Values.persistentVolumeClaim.storageNode }}
29+
30+
---
31+
apiVersion: v1
32+
kind: PersistentVolumeClaim
33+
metadata:
34+
name: datamate-flow-pvc
35+
{{- with .Values.annotations }}
36+
annotations:
37+
{{- toYaml . | indent 4 }}
38+
{{- end }}
39+
labels:
40+
{{- include "public.labels" . | nindent 4 }}
41+
spec:
42+
accessModes:
43+
- {{ .Values.persistentVolumeClaim.accessModes }}
44+
volumeName: {{ .Values.global.namespace | default "datamate" }}-flow-pv
45+
volumeMode: Filesystem
46+
resources:
47+
requests:
48+
storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }}
49+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
50+
51+
{{- else }}
52+
153
apiVersion: v1
254
kind: PersistentVolumeClaim
355
metadata:
@@ -16,4 +68,5 @@ spec:
1668
{{- end }}
1769
resources:
1870
requests:
19-
storage: {{ .Values.persistentVolumeClaim.size.flow }}
71+
storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }}
72+
{{- end }}

‎deployment/helm/datamate/charts/public/templates/log-pvc.yaml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }}
2+
apiVersion: v1
3+
kind: PersistentVolume
4+
metadata:
5+
name: {{ .Values.global.namespace | default "datamate" }}-log-pv
6+
spec:
7+
capacity:
8+
storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }}
9+
volumeMode: Filesystem
10+
accessModes:
11+
- {{ .Values.persistentVolumeClaim.accessModes }}
12+
persistentVolumeReclaimPolicy: Delete
13+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
14+
local: # local类型
15+
path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/log
16+
claimRef:
17+
apiVersion: v1
18+
kind: PersistentVolumeClaim
19+
name: datamate-log-pvc
20+
namespace: {{ .Values.global.namespace | default "datamate" }}
21+
nodeAffinity:
22+
required:
23+
nodeSelectorTerms:
24+
- matchExpressions:
25+
- key: kubernetes.io/hostname
26+
operator: In
27+
values:
28+
- {{ .Values.persistentVolumeClaim.storageNode }}
29+
30+
---
31+
apiVersion: v1
32+
kind: PersistentVolumeClaim
33+
metadata:
34+
name: datamate-log-pvc
35+
{{- with .Values.annotations }}
36+
annotations:
37+
{{- toYaml . | indent 4 }}
38+
{{- end }}
39+
labels:
40+
{{- include "public.labels" . | nindent 4 }}
41+
spec:
42+
accessModes:
43+
- {{ .Values.persistentVolumeClaim.accessModes }}
44+
volumeName: {{ .Values.global.namespace | default "datamate" }}-log-pv
45+
volumeMode: Filesystem
46+
resources:
47+
requests:
48+
storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }}
49+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
50+
51+
{{- else }}
52+
153
apiVersion: v1
254
kind: PersistentVolumeClaim
355
metadata:
@@ -16,4 +68,5 @@ spec:
1668
{{- end }}
1769
resources:
1870
requests:
19-
storage: {{ .Values.persistentVolumeClaim.size.log }}
71+
storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }}
72+
{{- end }}

‎deployment/helm/datamate/charts/public/templates/operator-pvc.yaml‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }}
2+
apiVersion: v1
3+
kind: PersistentVolume
4+
metadata:
5+
name: {{ .Values.global.namespace | default "datamate" }}-operator-pv
6+
spec:
7+
capacity:
8+
storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }}
9+
volumeMode: Filesystem
10+
accessModes:
11+
- {{ .Values.persistentVolumeClaim.accessModes }}
12+
persistentVolumeReclaimPolicy: Delete
13+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
14+
local: # local类型
15+
path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/operator
16+
claimRef:
17+
apiVersion: v1
18+
kind: PersistentVolumeClaim
19+
name: datamate-operator-pvc
20+
namespace: {{ .Values.global.namespace | default "datamate" }}
21+
nodeAffinity:
22+
required:
23+
nodeSelectorTerms:
24+
- matchExpressions:
25+
- key: kubernetes.io/hostname
26+
operator: In
27+
values:
28+
- {{ .Values.persistentVolumeClaim.storageNode }}
29+
30+
---
31+
apiVersion: v1
32+
kind: PersistentVolumeClaim
33+
metadata:
34+
name: datamate-operator-pvc
35+
{{- with .Values.annotations }}
36+
annotations:
37+
{{- toYaml . | indent 4 }}
38+
{{- end }}
39+
labels:
40+
{{- include "public.labels" . | nindent 4 }}
41+
spec:
42+
accessModes:
43+
- {{ .Values.persistentVolumeClaim.accessModes }}
44+
volumeName: {{ .Values.global.namespace | default "datamate" }}-operator-pv
45+
volumeMode: Filesystem
46+
resources:
47+
requests:
48+
storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }}
49+
storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
50+
51+
{{- else }}
52+
153
apiVersion: v1
254
kind: PersistentVolumeClaim
355
metadata:
@@ -16,4 +68,5 @@ spec:
1668
{{- end }}
1769
resources:
1870
requests:
19-
storage: {{ .Values.persistentVolumeClaim.size.operator }}
71+
storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }}
72+
{{- end }}

‎deployment/helm/datamate/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Declare variables to be passed into your templates.
44

55
global:
6+
namespace: datamate
67
deerFlow:
78
enable: false
89
image:
@@ -27,6 +28,8 @@ global:
2728
public:
2829
persistentVolumeClaim:
2930
storageClass: ""
31+
storagePath: ""
32+
storageNode: ""
3033
size:
3134
dataset: 10Gi
3235
flow: 1Gi

0 commit comments

Comments
 (0)