fix the invalid fmt of dataload cronJob helm template which leads to …

…YAML parse error (#4360) Signed-off-by: jiuyu <[email protected]> Co-authored-by: jiuyu <[email protected]>
fluid-cloudnative · Oct 16, 2024 · 3e38c94 · 3e38c94
1 parent c0cf719
commit 3e38c94
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 146 deletions.
diff --git a/charts/alluxio/Chart.yaml b/charts/alluxio/Chart.yaml
@@ -29,5 +29,5 @@ maintainers:
   email: [email protected]
 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
@@ -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
@@ -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
@@ -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
@@ -15,4 +15,7 @@
 - Dataload support Affinity,Tolerations,NodeSelector,SchedulerName
 
 ### 0.10.0
-- Support cron dataload
+- Support cron dataload
+
+### 0.10.3
+- Fix incorrect indentation of cron dataload template
diff --git 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
@@ -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
@@ -7,4 +7,7 @@
 - Support for setting affinity,tolerations,nodeSelector,schedulerName
 
 ### 0.10.0
-- Support cron dataload
+- Support cron dataload
+
+### 0.10.3
+- Fix incorrect indentation of cron dataload template
diff --git 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
@@ -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
@@ -11,4 +11,7 @@
 - Support for setting affinity,tolerations,nodeSelector,schedulerName
 
 ### 0.10.0
-- Support cron dataload
+- Support cron dataload
+
+### 0.10.3
+- Fix incorrect indentation of cron dataload template
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,4 +11,7 @@
 - Support for setting affinity,tolerations,nodeSelector,schedulerName
 
 ### 0.10.0
-- Support cron dataload
+- Support cron dataload
+
+### 0.10.3
+- Fix incorrect indentation of cron dataload template
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -8,5 +8,5 @@ maintainers:
   email: [email protected]
 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
@@ -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
@@ -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
@@ -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
@@ -12,5 +12,5 @@ maintainers:
 
 dependencies:
 - name: library
-  version: "0.1.0"
+  version: "0.2.0"
   repository: "file://../library"