diff --git a/deployment/helm/datamate/charts/public/templates/database-pvc.yaml b/deployment/helm/datamate/charts/public/templates/database-pvc.yaml index 36bbd61..4d324b0 100644 --- a/deployment/helm/datamate/charts/public/templates/database-pvc.yaml +++ b/deployment/helm/datamate/charts/public/templates/database-pvc.yaml @@ -1,3 +1,55 @@ +{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.global.namespace | default "datamate" }}-database-pv +spec: + capacity: + storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }} + volumeMode: Filesystem + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + persistentVolumeReclaimPolicy: Delete + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + local: # local类型 + path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/database + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: datamate-database-pvc + namespace: {{ .Values.global.namespace | default "datamate" }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - {{ .Values.persistentVolumeClaim.storageNode }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: datamate-database-pvc +{{- with .Values.annotations }} + annotations: + {{- toYaml . | indent 4 }} +{{- end }} + labels: + {{- include "public.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + volumeName: {{ .Values.global.namespace | default "datamate" }}-database-pv + volumeMode: Filesystem + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }} + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + +{{- else }} + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -16,4 +68,5 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistentVolumeClaim.size.database }} + storage: {{ .Values.persistentVolumeClaim.size.database | default "10Gi" }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/datamate/charts/public/templates/dataset-pvc.yaml b/deployment/helm/datamate/charts/public/templates/dataset-pvc.yaml index 3505a71..23cd304 100644 --- a/deployment/helm/datamate/charts/public/templates/dataset-pvc.yaml +++ b/deployment/helm/datamate/charts/public/templates/dataset-pvc.yaml @@ -1,3 +1,55 @@ +{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.global.namespace | default "datamate" }}-dataset-pv +spec: + capacity: + storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }} + volumeMode: Filesystem + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + persistentVolumeReclaimPolicy: Delete + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + local: # local类型 + path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/dataset + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: datamate-dataset-pvc + namespace: {{ .Values.global.namespace | default "datamate" }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - {{ .Values.persistentVolumeClaim.storageNode }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: datamate-dataset-pvc +{{- with .Values.annotations }} + annotations: + {{- toYaml . | indent 4 }} +{{- end }} + labels: + {{- include "public.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + volumeName: {{ .Values.global.namespace | default "datamate" }}-dataset-pv + volumeMode: Filesystem + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }} + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + +{{- else }} + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -16,4 +68,5 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistentVolumeClaim.size.dataset }} + storage: {{ .Values.persistentVolumeClaim.size.dataset | default "10Gi" }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/datamate/charts/public/templates/flow-pvc.yaml b/deployment/helm/datamate/charts/public/templates/flow-pvc.yaml index e09ac0a..62cf2c0 100644 --- a/deployment/helm/datamate/charts/public/templates/flow-pvc.yaml +++ b/deployment/helm/datamate/charts/public/templates/flow-pvc.yaml @@ -1,3 +1,55 @@ +{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.global.namespace | default "datamate" }}-flow-pv +spec: + capacity: + storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }} + volumeMode: Filesystem + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + persistentVolumeReclaimPolicy: Delete + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + local: # local类型 + path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/flow + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: datamate-flow-pvc + namespace: {{ .Values.global.namespace | default "datamate" }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - {{ .Values.persistentVolumeClaim.storageNode }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: datamate-flow-pvc +{{- with .Values.annotations }} + annotations: + {{- toYaml . | indent 4 }} +{{- end }} + labels: + {{- include "public.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + volumeName: {{ .Values.global.namespace | default "datamate" }}-flow-pv + volumeMode: Filesystem + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }} + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + +{{- else }} + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -16,4 +68,5 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistentVolumeClaim.size.flow }} + storage: {{ .Values.persistentVolumeClaim.size.flow | default "10Gi" }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/datamate/charts/public/templates/log-pvc.yaml b/deployment/helm/datamate/charts/public/templates/log-pvc.yaml index d6c702e..b864c9c 100644 --- a/deployment/helm/datamate/charts/public/templates/log-pvc.yaml +++ b/deployment/helm/datamate/charts/public/templates/log-pvc.yaml @@ -1,3 +1,55 @@ +{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.global.namespace | default "datamate" }}-log-pv +spec: + capacity: + storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }} + volumeMode: Filesystem + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + persistentVolumeReclaimPolicy: Delete + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + local: # local类型 + path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/log + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: datamate-log-pvc + namespace: {{ .Values.global.namespace | default "datamate" }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - {{ .Values.persistentVolumeClaim.storageNode }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: datamate-log-pvc +{{- with .Values.annotations }} + annotations: + {{- toYaml . | indent 4 }} +{{- end }} + labels: + {{- include "public.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + volumeName: {{ .Values.global.namespace | default "datamate" }}-log-pv + volumeMode: Filesystem + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }} + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + +{{- else }} + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -16,4 +68,5 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistentVolumeClaim.size.log }} + storage: {{ .Values.persistentVolumeClaim.size.log | default "10Gi" }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/datamate/charts/public/templates/operator-pvc.yaml b/deployment/helm/datamate/charts/public/templates/operator-pvc.yaml index 8552bd2..0589ab0 100644 --- a/deployment/helm/datamate/charts/public/templates/operator-pvc.yaml +++ b/deployment/helm/datamate/charts/public/templates/operator-pvc.yaml @@ -1,3 +1,55 @@ +{{- if and .Values.persistentVolumeClaim.storageClass (eq .Values.persistentVolumeClaim.storageClass "local-storage") }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.global.namespace | default "datamate" }}-operator-pv +spec: + capacity: + storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }} + volumeMode: Filesystem + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + persistentVolumeReclaimPolicy: Delete + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + local: # local类型 + path: {{ .Values.persistentVolumeClaim.storagePath | default "/opt/datamate/data" }}/operator + claimRef: + apiVersion: v1 + kind: PersistentVolumeClaim + name: datamate-operator-pvc + namespace: {{ .Values.global.namespace | default "datamate" }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - {{ .Values.persistentVolumeClaim.storageNode }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: datamate-operator-pvc +{{- with .Values.annotations }} + annotations: + {{- toYaml . | indent 4 }} +{{- end }} + labels: + {{- include "public.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.persistentVolumeClaim.accessModes }} + volumeName: {{ .Values.global.namespace | default "datamate" }}-operator-pv + volumeMode: Filesystem + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }} + storageClassName: {{ .Values.persistentVolumeClaim.storageClass }} + +{{- else }} + apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -16,4 +68,5 @@ spec: {{- end }} resources: requests: - storage: {{ .Values.persistentVolumeClaim.size.operator }} + storage: {{ .Values.persistentVolumeClaim.size.operator | default "10Gi" }} +{{- end }} \ No newline at end of file diff --git a/deployment/helm/datamate/values.yaml b/deployment/helm/datamate/values.yaml index 82febaa..1330419 100644 --- a/deployment/helm/datamate/values.yaml +++ b/deployment/helm/datamate/values.yaml @@ -3,6 +3,7 @@ # Declare variables to be passed into your templates. global: + namespace: datamate deerFlow: enable: false image: @@ -27,6 +28,8 @@ global: public: persistentVolumeClaim: storageClass: "" + storagePath: "" + storageNode: "" size: dataset: 10Gi flow: 1Gi