diff --git a/charts/alluxio/Chart.yaml b/charts/alluxio/Chart.yaml index e20eea28699..7aff85bb680 100644 --- a/charts/alluxio/Chart.yaml +++ b/charts/alluxio/Chart.yaml @@ -29,5 +29,5 @@ maintainers: email: niwangzz@163.com dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/efc/Chart.yaml b/charts/efc/Chart.yaml index 7c18f2ca466..2706d2fd824 100644 --- a/charts/efc/Chart.yaml +++ b/charts/efc/Chart.yaml @@ -10,5 +10,5 @@ maintainers: dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/fluid-databackup/alluxio/Chart.yaml b/charts/fluid-databackup/alluxio/Chart.yaml index aeffcbb27ad..6725760dac0 100644 --- a/charts/fluid-databackup/alluxio/Chart.yaml +++ b/charts/fluid-databackup/alluxio/Chart.yaml @@ -24,5 +24,5 @@ appVersion: 0.1.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-databackup/goosefs/Chart.yaml b/charts/fluid-databackup/goosefs/Chart.yaml index d95a8a976d0..bb52d560c9f 100644 --- a/charts/fluid-databackup/goosefs/Chart.yaml +++ b/charts/fluid-databackup/goosefs/Chart.yaml @@ -24,5 +24,5 @@ appVersion: 0.1.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/alluxio/CHANGELOG.md b/charts/fluid-dataloader/alluxio/CHANGELOG.md index 073bbcdc665..ac724316068 100644 --- a/charts/fluid-dataloader/alluxio/CHANGELOG.md +++ b/charts/fluid-dataloader/alluxio/CHANGELOG.md @@ -15,4 +15,7 @@ - Dataload support Affinity,Tolerations,NodeSelector,SchedulerName ### 0.10.0 -- Support cron dataload \ No newline at end of file +- Support cron dataload + +### 0.10.3 +- Fix incorrect indentation of cron dataload template \ No newline at end of file diff --git a/charts/fluid-dataloader/alluxio/Chart.yaml b/charts/fluid-dataloader/alluxio/Chart.yaml index e2cd3d5634e..a01634f964f 100644 --- a/charts/fluid-dataloader/alluxio/Chart.yaml +++ b/charts/fluid-dataloader/alluxio/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.3.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/alluxio/templates/cronjob.yaml b/charts/fluid-dataloader/alluxio/templates/cronjob.yaml index 502123904e7..57618a11953 100644 --- a/charts/fluid-dataloader/alluxio/templates/cronjob.yaml +++ b/charts/fluid-dataloader/alluxio/templates/cronjob.yaml @@ -61,26 +61,7 @@ spec: {{- end }} {{- end }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never - {{- with .Values.dataloader.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} containers: - name: dataloader image: {{ required "Dataloader image should be set" .Values.dataloader.image }} diff --git a/charts/fluid-dataloader/goosefs/CHANGELOG.md b/charts/fluid-dataloader/goosefs/CHANGELOG.md index 68e00f18a25..a3ac87b16c9 100644 --- a/charts/fluid-dataloader/goosefs/CHANGELOG.md +++ b/charts/fluid-dataloader/goosefs/CHANGELOG.md @@ -7,4 +7,7 @@ - Support for setting affinity,tolerations,nodeSelector,schedulerName ### 0.10.0 -- Support cron dataload \ No newline at end of file +- Support cron dataload + +### 0.10.3 +- Fix incorrect indentation of cron dataload template \ No newline at end of file diff --git a/charts/fluid-dataloader/goosefs/Chart.yaml b/charts/fluid-dataloader/goosefs/Chart.yaml index 27282e83178..446bb83b76d 100644 --- a/charts/fluid-dataloader/goosefs/Chart.yaml +++ b/charts/fluid-dataloader/goosefs/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.1.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/goosefs/templates/cronjob.yaml b/charts/fluid-dataloader/goosefs/templates/cronjob.yaml index 09c939391d0..d23959a0569 100644 --- a/charts/fluid-dataloader/goosefs/templates/cronjob.yaml +++ b/charts/fluid-dataloader/goosefs/templates/cronjob.yaml @@ -48,26 +48,7 @@ spec: cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never - {{- with .Values.dataloader.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} containers: - name: dataloader image: {{ required "Dataloader image should be set" .Values.dataloader.image }} diff --git a/charts/fluid-dataloader/jindo/CHANGELOG.md b/charts/fluid-dataloader/jindo/CHANGELOG.md index 6e8ef4f8969..1df9c7fa11a 100644 --- a/charts/fluid-dataloader/jindo/CHANGELOG.md +++ b/charts/fluid-dataloader/jindo/CHANGELOG.md @@ -11,4 +11,7 @@ - Support for setting affinity,tolerations,nodeSelector,schedulerName ### 0.10.0 -- Support cron dataload \ No newline at end of file +- Support cron dataload + +### 0.10.3 +- Fix incorrect indentation of cron dataload template \ No newline at end of file diff --git a/charts/fluid-dataloader/jindo/Chart.yaml b/charts/fluid-dataloader/jindo/Chart.yaml index 13fa37df317..e9a9b46ec75 100644 --- a/charts/fluid-dataloader/jindo/Chart.yaml +++ b/charts/fluid-dataloader/jindo/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.2.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/jindo/templates/cronjob.yaml b/charts/fluid-dataloader/jindo/templates/cronjob.yaml index 97ae7e75132..47255ec4d25 100644 --- a/charts/fluid-dataloader/jindo/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindo/templates/cronjob.yaml @@ -51,26 +51,7 @@ spec: cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never - {{- with .Values.dataloader.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} containers: - name: dataloader image: {{ required "Dataloader image should be set" .Values.dataloader.image }} diff --git a/charts/fluid-dataloader/jindocache/CHANGELOG.md b/charts/fluid-dataloader/jindocache/CHANGELOG.md index a84d9f74868..4ffe9782a00 100644 --- a/charts/fluid-dataloader/jindocache/CHANGELOG.md +++ b/charts/fluid-dataloader/jindocache/CHANGELOG.md @@ -1,3 +1,6 @@ +### 0.10.3 +- Fix incorrect indentation of cron dataload template + ### 0.10.1 - support force load data option diff --git a/charts/fluid-dataloader/jindocache/Chart.yaml b/charts/fluid-dataloader/jindocache/Chart.yaml index e12af17830a..2b734b53aa2 100644 --- a/charts/fluid-dataloader/jindocache/Chart.yaml +++ b/charts/fluid-dataloader/jindocache/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.5.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/jindocache/templates/cronjob.yaml b/charts/fluid-dataloader/jindocache/templates/cronjob.yaml index bddfc4bfa0b..0d40402b6b7 100644 --- a/charts/fluid-dataloader/jindocache/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindocache/templates/cronjob.yaml @@ -61,26 +61,7 @@ spec: {{- end }} {{- end }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never - {{- with .Values.dataloader.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} containers: - name: dataloader image: {{ required "Dataloader image should be set" .Values.dataloader.image }} diff --git a/charts/fluid-dataloader/jindofsx/CHANGELOG.md b/charts/fluid-dataloader/jindofsx/CHANGELOG.md index 1a9c02959bc..18a1ca61941 100644 --- a/charts/fluid-dataloader/jindofsx/CHANGELOG.md +++ b/charts/fluid-dataloader/jindofsx/CHANGELOG.md @@ -1,3 +1,5 @@ +### 0.10.3 +- Fix incorrect indentation of cron dataload template ### 0.10.0 - Support cron dataload diff --git a/charts/fluid-dataloader/jindofsx/Chart.yaml b/charts/fluid-dataloader/jindofsx/Chart.yaml index e12af17830a..2b734b53aa2 100644 --- a/charts/fluid-dataloader/jindofsx/Chart.yaml +++ b/charts/fluid-dataloader/jindofsx/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.5.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml b/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml index e579c42f9cb..1d2d6248aa8 100644 --- a/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml @@ -61,26 +61,7 @@ spec: {{- end }} {{- end }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never - {{- with .Values.dataloader.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} containers: - name: dataloader image: {{ required "Dataloader image should be set" .Values.dataloader.image }} diff --git a/charts/fluid-dataloader/juicefs/CHANGELOG.md b/charts/fluid-dataloader/juicefs/CHANGELOG.md index 21743059820..ffdd490ab87 100644 --- a/charts/fluid-dataloader/juicefs/CHANGELOG.md +++ b/charts/fluid-dataloader/juicefs/CHANGELOG.md @@ -11,4 +11,7 @@ - Support for setting affinity,tolerations,nodeSelector,schedulerName ### 0.10.0 -- Support cron dataload \ No newline at end of file +- Support cron dataload + +### 0.10.3 +- Fix incorrect indentation of cron dataload template \ No newline at end of file diff --git a/charts/fluid-dataloader/juicefs/Chart.yaml b/charts/fluid-dataloader/juicefs/Chart.yaml index 13fa37df317..e9a9b46ec75 100644 --- a/charts/fluid-dataloader/juicefs/Chart.yaml +++ b/charts/fluid-dataloader/juicefs/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.2.0 +version: 0.10.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -24,5 +24,5 @@ appVersion: 0.2.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataloader/juicefs/templates/cronjob.yaml b/charts/fluid-dataloader/juicefs/templates/cronjob.yaml index d0ebe68945b..6fff07af899 100644 --- a/charts/fluid-dataloader/juicefs/templates/cronjob.yaml +++ b/charts/fluid-dataloader/juicefs/templates/cronjob.yaml @@ -61,22 +61,7 @@ spec: {{- end }} {{- end }} spec: - {{- if .Values.dataloader.schedulerName }} - schedulerName: {{ .Values.dataloader.schedulerName }} - {{- end }} - {{- with .Values.dataloader.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.dataloader.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Never + {{- include "library.fluid.dataload.cronJobCommonTemplateSpec" . | nindent 10 }} {{- range $key, $val := .Values.dataloader.options }} {{- if eq $key "runtimeName" }} serviceAccountName: {{ printf "%s-loader" $val | quote }} diff --git a/charts/fluid-datamigrate/juicefs/Chart.yaml b/charts/fluid-datamigrate/juicefs/Chart.yaml index 0e920cffe40..acfc96829cf 100644 --- a/charts/fluid-datamigrate/juicefs/Chart.yaml +++ b/charts/fluid-datamigrate/juicefs/Chart.yaml @@ -24,5 +24,5 @@ appVersion: 0.1.0 dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/fluid-dataprocess/common/Chart.yaml b/charts/fluid-dataprocess/common/Chart.yaml index bfead882a4e..70188bd03c3 100644 --- a/charts/fluid-dataprocess/common/Chart.yaml +++ b/charts/fluid-dataprocess/common/Chart.yaml @@ -25,5 +25,5 @@ appVersion: "1.16.0" dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../../library" diff --git a/charts/goosefs/Chart.yaml b/charts/goosefs/Chart.yaml index 82c098a1529..82251f20f60 100644 --- a/charts/goosefs/Chart.yaml +++ b/charts/goosefs/Chart.yaml @@ -8,5 +8,5 @@ maintainers: email: chrisydxie@tencent.com dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/jindocache/Chart.yaml b/charts/jindocache/Chart.yaml index fd92a18c0b5..18f2a566124 100755 --- a/charts/jindocache/Chart.yaml +++ b/charts/jindocache/Chart.yaml @@ -20,5 +20,5 @@ name: jindofs dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/jindofs/Chart.yaml b/charts/jindofs/Chart.yaml index 8f76004407d..15dcc1f4186 100755 --- a/charts/jindofs/Chart.yaml +++ b/charts/jindofs/Chart.yaml @@ -20,5 +20,5 @@ name: jindofs dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/jindofsx/Chart.yaml b/charts/jindofsx/Chart.yaml index 69e63b774db..248672d4a96 100755 --- a/charts/jindofsx/Chart.yaml +++ b/charts/jindofsx/Chart.yaml @@ -20,5 +20,5 @@ name: jindofs dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/juicefs/Chart.yaml b/charts/juicefs/Chart.yaml index f2efad3b5d4..aac295238af 100644 --- a/charts/juicefs/Chart.yaml +++ b/charts/juicefs/Chart.yaml @@ -12,5 +12,5 @@ maintainers: dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/library/CHANGELOG.md b/charts/library/CHANGELOG.md new file mode 100644 index 00000000000..0f456544c15 --- /dev/null +++ b/charts/library/CHANGELOG.md @@ -0,0 +1,5 @@ +### 0.1.0 +- Add recommended labels + +### 0.2.0 +- Add common spec template of cron dataload \ No newline at end of file diff --git a/charts/library/Chart.yaml b/charts/library/Chart.yaml index 8eb26dd3bca..f0bf5769d30 100644 --- a/charts/library/Chart.yaml +++ b/charts/library/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: library description: A library chart consisting commonly used helm templates for Fluid runtimes. type: library # https://helm.sh/docs/topics/library_charts/ -version: 0.1.0 +version: 0.2.0 diff --git a/charts/library/templates/_common_component_in_dataload_cronjob.tpl b/charts/library/templates/_common_component_in_dataload_cronjob.tpl new file mode 100644 index 00000000000..013f1d7e387 --- /dev/null +++ b/charts/library/templates/_common_component_in_dataload_cronjob.tpl @@ -0,0 +1,25 @@ +{{/* +Common component in Dataload-cronJob.Spec.Template.Spec. Follow the following guidance: +*/}} +{{- define "library.fluid.dataload.cronJobCommonTemplateSpec" -}} +{{- if .Values.dataloader.schedulerName }} +schedulerName: {{ .Values.dataloader.schedulerName }} +{{- end }} +{{- with .Values.dataloader.nodeSelector }} +nodeSelector: +{{- toYaml . | nindent 2 }} +{{- end }} +{{- with .Values.dataloader.affinity }} +affinity: +{{- toYaml . | nindent 2 }} +{{- end }} +{{- with .Values.dataloader.tolerations }} +tolerations: +{{- toYaml . | nindent 2 }} +{{- end }} +restartPolicy: Never +{{- with .Values.dataloader.imagePullSecrets }} +imagePullSecrets: +{{- toYaml . | nindent 2 }} +{{- end }} +{{- end }} diff --git a/charts/thin/Chart.yaml b/charts/thin/Chart.yaml index 33850f79958..b845a730867 100644 --- a/charts/thin/Chart.yaml +++ b/charts/thin/Chart.yaml @@ -7,5 +7,5 @@ maintainers: dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library" diff --git a/charts/vineyard/Chart.yaml b/charts/vineyard/Chart.yaml index 0e058b6f008..a395cf11abe 100644 --- a/charts/vineyard/Chart.yaml +++ b/charts/vineyard/Chart.yaml @@ -17,5 +17,5 @@ name: vineyard dependencies: - name: library - version: "0.1.0" + version: "0.2.0" repository: "file://../library"