diff --git a/deploy/kubernetes/dolphinscheduler/Chart.yaml b/deploy/kubernetes/dolphinscheduler/Chart.yaml index ee7efbfd5711..78f5be6c97cf 100644 --- a/deploy/kubernetes/dolphinscheduler/Chart.yaml +++ b/deploy/kubernetes/dolphinscheduler/Chart.yaml @@ -43,7 +43,7 @@ appVersion: 3.1.0 dependencies: - name: postgresql - version: 12.1.5 + version: 18.6.7 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: zookeeper @@ -55,6 +55,6 @@ dependencies: repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami condition: mysql.enabled - name: minio - version: 11.10.26 + version: 17.0.21 repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami - condition: minio.enabled + condition: minio.enabled \ No newline at end of file diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java index 8ec116c7cc4a..7b76af6d21d8 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java @@ -138,7 +138,7 @@ public Result> triggerWorkflowDefinition(@Parameter(hidden = true) @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId, @RequestParam(value = "runMode", required = false) RunMode runMode, @RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode, @RequestParam(value = "startParams", required = false) String startParams, @@ -257,7 +257,7 @@ public Result> batchTriggerWorkflowDefinitions(@Parameter(hidden = @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId, @RequestParam(value = "runMode", required = false) RunMode runMode, @RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode, @RequestParam(value = "startParams", required = false) String startParams, @@ -391,7 +391,7 @@ public Result startStreamTaskInstance(@Parameter(hidden = true) @Reques @Parameter(name = "code", description = "TASK_CODE", required = true) @PathVariable long code, @RequestParam(value = "version", required = true) int version, @RequestParam(value = "warningGroupId", required = false, defaultValue = "0") Integer warningGroupId, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = \"workerGroup\", required = false, defaultValue = \"\") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode, @RequestParam(value = "startParams", required = false) String startParams, @@ -441,3 +441,4 @@ public Result executeTask(@Parameter(hidden = true) @RequestAttribute(value = Co } } + diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java index 27b38b669280..eb6c69d8e323 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java @@ -113,7 +113,7 @@ public Result createSchedule(@Parameter(hidden = true) @RequestAttribu @RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType, @RequestParam(value = "warningGroupId", required = false, defaultValue = DEFAULT_NOTIFY_GROUP_ID) int warningGroupId, @RequestParam(value = "failureStrategy", required = false, defaultValue = DEFAULT_FAILURE_POLICY) FailureStrategy failureStrategy, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode, @RequestParam(value = "workflowInstancePriority", required = false, defaultValue = DEFAULT_WORKFLOW_INSTANCE_PRIORITY) Priority workflowInstancePriority) { @@ -170,7 +170,7 @@ public Result updateSchedule(@Parameter(hidden = true) @RequestAttribu @RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType, @RequestParam(value = "warningGroupId", required = false, defaultValue = DEFAULT_NOTIFY_GROUP_ID) int warningGroupId, @RequestParam(value = "failureStrategy", required = false, defaultValue = "END") FailureStrategy failureStrategy, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode, @RequestParam(value = "workflowInstancePriority", required = false, defaultValue = DEFAULT_WORKFLOW_INSTANCE_PRIORITY) Priority workflowInstancePriority) { @@ -337,7 +337,7 @@ public Result updateScheduleByWorkflowDefinitionCode(@Parameter(hidden @RequestParam(value = "warningType", required = false, defaultValue = DEFAULT_WARNING_TYPE) WarningType warningType, @RequestParam(value = "warningGroupId", required = false) int warningGroupId, @RequestParam(value = "failureStrategy", required = false, defaultValue = "END") FailureStrategy failureStrategy, - @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup, + @RequestParam(value = "workerGroup", required = false, defaultValue = "") String workerGroup, @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode, @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") long environmentCode, @RequestParam(value = "workflowInstancePriority", required = false) Priority workflowInstancePriority) { @@ -348,3 +348,5 @@ public Result updateScheduleByWorkflowDefinitionCode(@Parameter(hidden return Result.success(updatedSchedule); } } + +