From d5c543f4679bda96c4e62646178129e10efffb9a Mon Sep 17 00:00:00 2001 From: Jay Chung Date: Wed, 7 Feb 2024 10:41:04 +0800 Subject: [PATCH] Revert some incompatible change for 3.2.1 (#15580) * Revert "Fix k8sTaskExecutionContext setting configYaml (#15116)" This reverts commit ce11674668cf26747f34c3474763c32e1ba5b6d1. * Revert "[Improvement] Refactoring K8S task plugin with connections managed in connection center (#14977)" This reverts commit c532fea00ef876a920551067eb2f5c72e2b72d61. --- .../pom.xml | 3 +- .../dolphinscheduler-alert-all/pom.xml | 3 +- .../dolphinscheduler-alert-api/pom.xml | 3 +- .../dolphinscheduler-alert-dingtalk/pom.xml | 3 +- .../dolphinscheduler-alert-email/pom.xml | 3 +- .../dolphinscheduler-alert-feishu/pom.xml | 3 +- .../dolphinscheduler-alert-http/pom.xml | 3 +- .../dolphinscheduler-alert-pagerduty/pom.xml | 3 +- .../dolphinscheduler-alert-prometheus/pom.xml | 3 +- .../dolphinscheduler-alert-script/pom.xml | 3 +- .../dolphinscheduler-alert-slack/pom.xml | 3 +- .../dolphinscheduler-alert-telegram/pom.xml | 3 +- .../dolphinscheduler-alert-webexteams/pom.xml | 3 +- .../dolphinscheduler-alert-wechat/pom.xml | 3 +- .../dolphinscheduler-alert-plugins/pom.xml | 3 +- .../dolphinscheduler-alert-server/pom.xml | 3 +- dolphinscheduler-alert/pom.xml | 3 +- dolphinscheduler-aop/pom.xml | 3 +- dolphinscheduler-api/pom.xml | 3 +- dolphinscheduler-bom/pom.xml | 3 +- dolphinscheduler-common/pom.xml | 3 +- .../dolphinscheduler-dao-api/pom.xml | 3 +- .../dolphinscheduler-dao-h2/pom.xml | 3 +- .../dolphinscheduler-dao-mysql/pom.xml | 3 +- .../dolphinscheduler-dao-plugin-all/pom.xml | 3 +- .../dolphinscheduler-dao-postgresql/pom.xml | 3 +- dolphinscheduler-dao-plugin/pom.xml | 3 +- dolphinscheduler-dao/pom.xml | 3 +- dolphinscheduler-data-quality/pom.xml | 3 +- .../dolphinscheduler-datasource-all/pom.xml | 8 +- .../dolphinscheduler-datasource-api/pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../dolphinscheduler-datasource-db2/pom.xml | 3 +- .../dolphinscheduler-datasource-doris/pom.xml | 3 +- .../dolphinscheduler-datasource-hana/pom.xml | 3 +- .../dolphinscheduler-datasource-hive/pom.xml | 3 +- .../dolphinscheduler-datasource-k8s/pom.xml | 49 ------- .../datasource/k8s/K8sClientWrapper.java | 55 -------- .../datasource/k8s/K8sDataSourceChannel.java | 37 ----- .../k8s/K8sDataSourceChannelFactory.java | 38 ------ .../k8s/param/K8sConnectionParam.java | 32 ----- .../k8s/param/K8sDataSourceParamDTO.java | 35 ----- .../k8s/param/K8sDataSourceProcessor.java | 129 ------------------ .../k8s/K8sDataSourceProcessorTest.java | 107 --------------- .../pom.xml | 3 +- .../dolphinscheduler-datasource-mysql/pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- .../SagemakerDataSourceProcessorTest.java | 1 + .../pom.xml | 3 +- .../dolphinscheduler-datasource-spark/pom.xml | 3 +- .../pom.xml | 3 +- .../dolphinscheduler-datasource-ssh/pom.xml | 3 +- .../pom.xml | 3 +- .../dolphinscheduler-datasource-trino/pom.xml | 3 +- .../pom.xml | 3 +- .../pom.xml | 3 +- dolphinscheduler-datasource-plugin/pom.xml | 4 +- dolphinscheduler-dist/pom.xml | 3 +- .../e2e/pages/datasource/DataSourcePage.java | 6 - .../dolphinscheduler-extract-alert/pom.xml | 3 +- .../dolphinscheduler-extract-base/pom.xml | 3 +- .../dolphinscheduler-extract-common/pom.xml | 3 +- .../dolphinscheduler-extract-master/pom.xml | 3 +- .../dolphinscheduler-extract-worker/pom.xml | 3 +- dolphinscheduler-extract/pom.xml | 3 +- dolphinscheduler-master/pom.xml | 3 +- dolphinscheduler-meter/pom.xml | 3 +- dolphinscheduler-microbench/pom.xml | 3 +- .../dolphinscheduler-registry-all/pom.xml | 3 +- .../dolphinscheduler-registry-api/pom.xml | 3 +- .../dolphinscheduler-registry-etcd/pom.xml | 3 +- .../dolphinscheduler-registry-jdbc/pom.xml | 3 +- .../pom.xml | 3 +- .../dolphinscheduler-registry-plugins/pom.xml | 3 +- dolphinscheduler-registry/pom.xml | 3 +- .../dolphinscheduler-scheduler-all/pom.xml | 3 +- .../dolphinscheduler-scheduler-api/pom.xml | 3 +- .../dolphinscheduler-scheduler-quartz/pom.xml | 3 +- dolphinscheduler-scheduler-plugin/pom.xml | 3 +- dolphinscheduler-service/pom.xml | 3 +- dolphinscheduler-spi/pom.xml | 3 +- .../dolphinscheduler/spi/enums/DbType.java | 4 +- dolphinscheduler-standalone-server/pom.xml | 3 +- .../dolphinscheduler-storage-abs/pom.xml | 3 +- .../dolphinscheduler-storage-all/pom.xml | 3 +- .../dolphinscheduler-storage-api/pom.xml | 3 +- .../dolphinscheduler-storage-gcs/pom.xml | 3 +- .../dolphinscheduler-storage-hdfs/pom.xml | 3 +- .../dolphinscheduler-storage-obs/pom.xml | 3 +- .../dolphinscheduler-storage-oss/pom.xml | 3 +- .../dolphinscheduler-storage-s3/pom.xml | 3 +- dolphinscheduler-storage-plugin/pom.xml | 3 +- .../dolphinscheduler-task-all-prune/pom.xml | 3 +- .../dolphinscheduler-task-all/pom.xml | 3 +- .../dolphinscheduler-task-api/pom.xml | 3 +- .../task/api/K8sTaskExecutionContext.java | 10 +- .../task/api/k8s/K8sTaskMainParameters.java | 1 + .../api/parameters/AbstractParameters.java | 13 -- .../api/parameters/K8sTaskParameters.java | 17 +-- .../task/api/k8s/K8sTaskExecutorTest.java | 12 +- .../dolphinscheduler-task-chunjun/pom.xml | 3 +- .../dolphinscheduler-task-datafactory/pom.xml | 3 +- .../dolphinscheduler-task-dataquality/pom.xml | 3 +- .../dolphinscheduler-task-datasync/pom.xml | 3 +- .../dolphinscheduler-task-datax/pom.xml | 3 +- .../dolphinscheduler-task-dinky/pom.xml | 3 +- .../dolphinscheduler-task-dms/pom.xml | 3 +- .../dolphinscheduler-task-dvc/pom.xml | 3 +- .../dolphinscheduler-task-emr/pom.xml | 3 +- .../pom.xml | 3 +- .../dolphinscheduler-task-flink/pom.xml | 3 +- .../dolphinscheduler-task-hivecli/pom.xml | 3 +- .../dolphinscheduler-task-http/pom.xml | 3 +- .../dolphinscheduler-task-java/pom.xml | 3 +- .../dolphinscheduler-task-jupyter/pom.xml | 3 +- .../dolphinscheduler-task-k8s/pom.xml | 3 +- .../plugin/task/k8s/K8sTask.java | 39 ++---- .../plugin/task/k8s/K8sTaskChannel.java | 2 +- .../plugin/task/k8s/K8sParametersTest.java | 2 +- .../plugin/task/k8s/K8sTaskTest.java | 83 ++++------- .../dolphinscheduler-task-kubeflow/pom.xml | 3 +- .../dolphinscheduler-task-linkis/pom.xml | 3 +- .../dolphinscheduler-task-mlflow/pom.xml | 3 +- .../dolphinscheduler-task-mr/pom.xml | 3 +- .../dolphinscheduler-task-openmldb/pom.xml | 3 +- .../dolphinscheduler-task-pigeon/pom.xml | 3 +- .../dolphinscheduler-task-procedure/pom.xml | 3 +- .../dolphinscheduler-task-python/pom.xml | 3 +- .../dolphinscheduler-task-pytorch/pom.xml | 3 +- .../dolphinscheduler-task-remoteshell/pom.xml | 3 +- .../dolphinscheduler-task-sagemaker/pom.xml | 3 +- .../task/sagemaker/SagemakerTaskTest.java | 1 + .../dolphinscheduler-task-seatunnel/pom.xml | 3 +- .../dolphinscheduler-task-shell/pom.xml | 3 +- .../dolphinscheduler-task-spark/pom.xml | 3 +- .../dolphinscheduler-task-sql/pom.xml | 3 +- .../dolphinscheduler-task-sqoop/pom.xml | 3 +- .../dolphinscheduler-task-zeppelin/pom.xml | 3 +- .../plugin/task/zeppelin/ZeppelinTask.java | 2 +- dolphinscheduler-task-plugin/pom.xml | 3 +- dolphinscheduler-tools/pom.xml | 3 +- dolphinscheduler-ui/pom.xml | 3 +- .../src/service/modules/data-source/types.ts | 4 - .../src/views/datasource/list/detail.tsx | 41 +----- .../src/views/datasource/list/use-form.ts | 23 +--- .../task/components/node/fields/use-k8s.ts | 8 +- .../task/components/node/format-data.ts | 3 - .../task/components/node/tasks/use-k8s.ts | 7 +- dolphinscheduler-worker/pom.xml | 3 +- pom.xml | 3 +- 159 files changed, 333 insertions(+), 827 deletions(-) delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sClientWrapper.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannel.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sConnectionParam.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceParamDTO.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java delete mode 100644 dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/test/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceProcessorTest.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml index 61e9ce4971..db9b2147e6 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-aliyunVoice/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml index 72d3187bf0..618200bb42 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml index 01dcbc1b23..7b5a0cd499 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-api/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml index 2c39a7a8c4..67f63b26a0 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml index 85e2de9831..a62606e8fe 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml index efe56bd665..41c65ff109 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml index 3443f189eb..c8e00ce37b 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml index bcb430c83b..751527c0c8 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml index 5819d5519d..39cdd2deb6 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-prometheus/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml index f7e636e1e3..83d935ab84 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml index 00887509ef..64debfe78e 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml index 7674c46491..021f31a493 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml index fe83581be6..c856151d03 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml index 07da2896e1..86f1382041 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml index 8f2fd23263..9edd2b98f9 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml index 5a9b75ff18..945c00987f 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index 9959d739da..9672d938a2 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-aop/pom.xml b/dolphinscheduler-aop/pom.xml index 3abc598889..eec38aff78 100644 --- a/dolphinscheduler-aop/pom.xml +++ b/dolphinscheduler-aop/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index c00c60bd32..6eea28ac61 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index f1a7535cc6..9a6fcf9c56 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index 3bad9a3d82..a8cac10d05 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml index 52d171a3c3..3efbc26fa7 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml index 4fe1d6b422..0c5bb927cb 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-h2/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml index a788fff7d2..cdaa72114b 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml index 3352ab0d7f..29dd846559 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-plugin-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml index c10ce7866f..e31fea9c36 100644 --- a/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml +++ b/dolphinscheduler-dao-plugin/dolphinscheduler-dao-postgresql/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao-plugin/pom.xml b/dolphinscheduler-dao-plugin/pom.xml index 1e4581c7a9..b165c54208 100644 --- a/dolphinscheduler-dao-plugin/pom.xml +++ b/dolphinscheduler-dao-plugin/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index 13e20bd740..af1fd33cde 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-data-quality/pom.xml b/dolphinscheduler-data-quality/pom.xml index 73bf20a56f..f67aac8fac 100644 --- a/dolphinscheduler-data-quality/pom.xml +++ b/dolphinscheduler-data-quality/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml index db51078ae9..4cb23d0897 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler @@ -147,11 +148,6 @@ dolphinscheduler-datasource-sagemaker ${project.version} - - org.apache.dolphinscheduler - dolphinscheduler-datasource-k8s - ${project.version} - org.apache.dolphinscheduler dolphinscheduler-datasource-hana diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml index 01cc4c1de4..0ca852d9c0 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml index 6072c6544a..eff3ac9ae2 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-athena/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml index 38f1636fb5..a4dd420f63 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-azure-sql/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml index 574e0fa587..59d5013ac5 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-clickhouse/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml index dcb031c86e..a3c8bc4317 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dameng/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml index 1cb14f5a12..4f6daae6ee 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-databend/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml index 6bce6f74c8..fb4e382f60 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-db2/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml index d0dcfd3bb3..672468d8e5 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-doris/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml index f93c5cdfdf..ee82b7c829 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hana/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml index 38bf47b9c8..bc960dff21 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml deleted file mode 100644 index 5d58a031f0..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.apache.dolphinscheduler - dolphinscheduler-datasource-plugin - 3.2.2-SNAPSHOT - - - dolphinscheduler-datasource-k8s - jar - ${project.artifactId} - - - - org.apache.dolphinscheduler - dolphinscheduler-spi - provided - - - - org.apache.dolphinscheduler - dolphinscheduler-datasource-api - ${project.version} - - - - io.fabric8 - kubernetes-client - - - - diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sClientWrapper.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sClientWrapper.java deleted file mode 100644 index 292eaf2f3d..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sClientWrapper.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s; - -import lombok.extern.slf4j.Slf4j; -import io.fabric8.kubernetes.api.model.NamespaceList; -import io.fabric8.kubernetes.client.Config; -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClientBuilder; - -@Slf4j -public class K8sClientWrapper implements AutoCloseable { - - private KubernetesClient client; - - public K8sClientWrapper() { - } - - public boolean checkConnect(String kubeConfigYaml, String namespace) { - try { - Config config = Config.fromKubeconfig(kubeConfigYaml); - client = new KubernetesClientBuilder().withConfig(config).build(); - NamespaceList namespaceList = client.namespaces().list(); - if (!namespaceList.getItems().stream().anyMatch(ns -> ns.getMetadata().getName().equals(namespace))) { - log.info("failed to connect to the K8S cluster, namespace not found\n"); - return false; - } - log.info("successfully connected to the K8S cluster"); - return true; - } catch (Exception e) { - log.info("failed to connect to the K8S cluster\n"); - return false; - } - } - - @Override - public void close() throws Exception { - - } -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannel.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannel.java deleted file mode 100644 index 3dac639259..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannel.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s; - -import org.apache.dolphinscheduler.spi.datasource.AdHocDataSourceClient; -import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; -import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel; -import org.apache.dolphinscheduler.spi.datasource.PooledDataSourceClient; -import org.apache.dolphinscheduler.spi.enums.DbType; - -public class K8sDataSourceChannel implements DataSourceChannel { - - @Override - public AdHocDataSourceClient createAdHocDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) { - throw new UnsupportedOperationException("K8S AdHocDataSourceClient is not supported"); - } - - @Override - public PooledDataSourceClient createPooledDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) { - throw new UnsupportedOperationException("K8S AdHocDataSourceClient is not supported"); - } -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java deleted file mode 100644 index 03ec046de8..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceChannelFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s; - -import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel; -import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory; - -import com.google.auto.service.AutoService; - -@AutoService(DataSourceChannelFactory.class) -public class K8sDataSourceChannelFactory implements DataSourceChannelFactory { - - @Override - public DataSourceChannel create() { - return new K8sDataSourceChannel(); - } - - @Override - public String getName() { - return "k8s"; - } - -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sConnectionParam.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sConnectionParam.java deleted file mode 100644 index 09e3e706a1..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sConnectionParam.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s.param; - -import org.apache.dolphinscheduler.spi.datasource.ConnectionParam; - -import lombok.Data; - -import com.fasterxml.jackson.annotation.JsonInclude; - -@Data -@JsonInclude(JsonInclude.Include.NON_NULL) -public class K8sConnectionParam implements ConnectionParam { - - protected String kubeConfig; - protected String namespace; -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceParamDTO.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceParamDTO.java deleted file mode 100644 index f2ea50a40b..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceParamDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s.param; - -import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO; -import org.apache.dolphinscheduler.spi.enums.DbType; - -import lombok.Data; - -@Data -public class K8sDataSourceParamDTO extends BaseDataSourceParamDTO { - - protected String kubeConfig; - protected String namespace; - - @Override - public DbType getType() { - return DbType.K8S; - } -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java deleted file mode 100644 index 9e7342d433..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/main/java/org/apache/dolphinscheduler/plugin/datasource/k8s/param/K8sDataSourceProcessor.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s.param; - -import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor; -import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO; -import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor; -import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils; -import org.apache.dolphinscheduler.plugin.datasource.k8s.K8sClientWrapper; -import org.apache.dolphinscheduler.spi.datasource.ConnectionParam; -import org.apache.dolphinscheduler.spi.enums.DbType; - -import org.apache.commons.lang3.StringUtils; - -import java.io.IOException; -import java.sql.Connection; -import java.sql.SQLException; -import java.text.MessageFormat; - -import lombok.extern.slf4j.Slf4j; - -import com.google.auto.service.AutoService; - -@AutoService(DataSourceProcessor.class) -@Slf4j -public class K8sDataSourceProcessor extends AbstractDataSourceProcessor { - - @Override - public BaseDataSourceParamDTO castDatasourceParamDTO(String paramJson) { - return JSONUtils.parseObject(paramJson, K8sDataSourceParamDTO.class); - - } - - @Override - public void checkDatasourceParam(BaseDataSourceParamDTO datasourceParam) { - K8sDataSourceParamDTO k8sDataSourceParamDTO = (K8sDataSourceParamDTO) datasourceParam; - if (StringUtils.isEmpty(k8sDataSourceParamDTO.getKubeConfig())) { - throw new IllegalArgumentException("sagemaker datasource param is not valid"); - } - } - - @Override - public String getDatasourceUniqueId(ConnectionParam connectionParam, DbType dbType) { - K8sConnectionParam baseConnectionParam = (K8sConnectionParam) connectionParam; - return MessageFormat.format("{0}@{1}@{2}", dbType.getDescp(), - PasswordUtils.encodePassword(baseConnectionParam.getKubeConfig()), baseConnectionParam.getNamespace()); - } - - @Override - public BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson) { - K8sConnectionParam connectionParams = (K8sConnectionParam) createConnectionParams(connectionJson); - K8sDataSourceParamDTO k8sDataSourceParamDTO = new K8sDataSourceParamDTO(); - k8sDataSourceParamDTO.setKubeConfig(connectionParams.getKubeConfig()); - k8sDataSourceParamDTO.setNamespace(connectionParams.getNamespace()); - return k8sDataSourceParamDTO; - } - - @Override - public K8sConnectionParam createConnectionParams(BaseDataSourceParamDTO datasourceParam) { - K8sDataSourceParamDTO k8sDataSourceParam = (K8sDataSourceParamDTO) datasourceParam; - K8sConnectionParam k8sConnectionParam = new K8sConnectionParam(); - k8sConnectionParam.setKubeConfig(k8sDataSourceParam.getKubeConfig()); - k8sConnectionParam.setNamespace(k8sDataSourceParam.getNamespace()); - return k8sConnectionParam; - } - - @Override - public ConnectionParam createConnectionParams(String connectionJson) { - return JSONUtils.parseObject(connectionJson, K8sConnectionParam.class); - } - - @Override - public String getDatasourceDriver() { - return ""; - } - - @Override - public String getValidationQuery() { - return ""; - } - - @Override - public String getJdbcUrl(ConnectionParam connectionParam) { - return ""; - } - - @Override - public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException, IOException { - return null; - } - - @Override - public boolean checkDataSourceConnectivity(ConnectionParam connectionParam) { - K8sConnectionParam baseConnectionParam = (K8sConnectionParam) connectionParam; - try ( - K8sClientWrapper k8sClientWrapper = new K8sClientWrapper()) { - return k8sClientWrapper.checkConnect(baseConnectionParam.kubeConfig, baseConnectionParam.namespace); - } catch (Exception e) { - log.error("failed to connect to the K8S cluster", e); - return false; - } - } - - @Override - public DbType getDbType() { - return DbType.K8S; - } - - @Override - public DataSourceProcessor create() { - return new K8sDataSourceProcessor(); - } -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/test/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceProcessorTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/test/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceProcessorTest.java deleted file mode 100644 index fe41f97686..0000000000 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-k8s/src/test/java/org/apache/dolphinscheduler/plugin/datasource/k8s/K8sDataSourceProcessorTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.dolphinscheduler.plugin.datasource.k8s; - -import org.apache.dolphinscheduler.plugin.datasource.k8s.param.K8sConnectionParam; -import org.apache.dolphinscheduler.plugin.datasource.k8s.param.K8sDataSourceParamDTO; -import org.apache.dolphinscheduler.plugin.datasource.k8s.param.K8sDataSourceProcessor; -import org.apache.dolphinscheduler.spi.enums.DbType; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.MockedConstruction; -import org.mockito.Mockito; -import org.mockito.junit.jupiter.MockitoExtension; - -@ExtendWith(MockitoExtension.class) -public class K8sDataSourceProcessorTest { - - private K8sDataSourceProcessor k8sDataSourceProcessor; - - private String connectJson = - "{\"namespace\":\"namespace\",\"kubeConfig\":\"kubeConfig\"}"; - - @BeforeEach - public void init() { - k8sDataSourceProcessor = new K8sDataSourceProcessor(); - } - - @Test - void testCheckDatasourceParam() { - K8sDataSourceParamDTO k8sDataSourceParamDTO = new K8sDataSourceParamDTO(); - Assertions.assertThrows(IllegalArgumentException.class, - () -> k8sDataSourceProcessor.checkDatasourceParam(k8sDataSourceParamDTO)); - k8sDataSourceParamDTO.setNamespace("namespace"); - Assertions.assertThrows(IllegalArgumentException.class, - () -> k8sDataSourceProcessor.checkDatasourceParam(k8sDataSourceParamDTO)); - k8sDataSourceParamDTO.setKubeConfig("kubeConfig"); - Assertions - .assertDoesNotThrow( - () -> k8sDataSourceProcessor.checkDatasourceParam(k8sDataSourceParamDTO)); - } - - @Test - void testGetDatasourceUniqueId() { - K8sConnectionParam k8sConnectionParam = new K8sConnectionParam(); - k8sConnectionParam.setNamespace("namespace"); - k8sConnectionParam.setKubeConfig("kubeConfig"); - Assertions.assertEquals("k8s@kubeConfig@namespace", - k8sDataSourceProcessor.getDatasourceUniqueId(k8sConnectionParam, DbType.K8S)); - - } - - @Test - void testCreateDatasourceParamDTO() { - K8sDataSourceParamDTO k8sDataSourceParamDTO = - (K8sDataSourceParamDTO) k8sDataSourceProcessor.createDatasourceParamDTO(connectJson); - Assertions.assertEquals("namespace", k8sDataSourceParamDTO.getNamespace()); - Assertions.assertEquals("kubeConfig", k8sDataSourceParamDTO.getKubeConfig()); - } - - @Test - void testCreateConnectionParams() { - K8sDataSourceParamDTO k8sDataSourceParamDTO = - (K8sDataSourceParamDTO) k8sDataSourceProcessor.createDatasourceParamDTO(connectJson); - K8sConnectionParam k8sConnectionParam = - k8sDataSourceProcessor.createConnectionParams(k8sDataSourceParamDTO); - Assertions.assertEquals("namespace", k8sConnectionParam.getNamespace()); - Assertions.assertEquals("kubeConfig", k8sConnectionParam.getKubeConfig()); - } - - @Test - void testTestConnection() { - K8sDataSourceParamDTO k8sDataSourceParamDTO = - (K8sDataSourceParamDTO) k8sDataSourceProcessor.createDatasourceParamDTO(connectJson); - K8sConnectionParam connectionParam = - k8sDataSourceProcessor.createConnectionParams(k8sDataSourceParamDTO); - Assertions.assertFalse(k8sDataSourceProcessor.checkDataSourceConnectivity(connectionParam)); - - try ( - MockedConstruction k8sClientWrapperMockedConstruction = - Mockito.mockConstruction(K8sClientWrapper.class, (mock, context) -> { - Mockito.when( - mock.checkConnect(connectionParam.getKubeConfig(), connectionParam.getNamespace())) - .thenReturn(true); - })) { - Assertions.assertTrue(k8sDataSourceProcessor.checkDataSourceConnectivity(connectionParam)); - } - - } -} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml index 3f36391181..c08037b56e 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml index 67b6d49b9f..e707c5511d 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-mysql/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml index 9af1e5b007..170da2fb85 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oceanbase/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml index 27c96f36c6..23826baf73 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-oracle/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml index 4f4cdfc27f..e965be7ffb 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-postgresql/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml index 6977c0a566..7a7ab9014c 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml index a5c8bb16f9..8600772a90 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-redshift/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml index 9b1a366e5c..ff111ac836 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/test/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceProcessorTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/test/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceProcessorTest.java index 395e7e5d3f..424f478699 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/test/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceProcessorTest.java +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sagemaker/src/test/java/org/apache/dolphinscheduler/plugin/datasource/sagemaker/SagemakerDataSourceProcessorTest.java @@ -31,6 +31,7 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) + public class SagemakerDataSourceProcessorTest { private SagemakerDataSourceProcessor sagemakerDataSourceProcessor; diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml index 1afc59f194..e752f368c7 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-snowflake/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml index 60c131d236..049210edd3 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-spark/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml index e5d66d2c0e..823608db5d 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml index b41c55d5a6..300b2075eb 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-ssh/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml index f84bce07a8..d0f1fd338d 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-starrocks/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml index a9bf24dba7..6feec05a1e 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-trino/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml index cf0005d634..2e51f9a3b7 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-vertica/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml index 3333e16f83..d987c8ca37 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-zeppelin/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-datasource-plugin/pom.xml b/dolphinscheduler-datasource-plugin/pom.xml index 12cfb811d6..3e2183d5e3 100644 --- a/dolphinscheduler-datasource-plugin/pom.xml +++ b/dolphinscheduler-datasource-plugin/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler @@ -53,7 +54,6 @@ dolphinscheduler-datasource-vertica dolphinscheduler-datasource-doris dolphinscheduler-datasource-sagemaker - dolphinscheduler-datasource-k8s dolphinscheduler-datasource-hana diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 3eb02af08b..09d2bfded8 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/datasource/DataSourcePage.java b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/datasource/DataSourcePage.java index bd2f7e795b..3b8633443d 100644 --- a/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/datasource/DataSourcePage.java +++ b/dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/datasource/DataSourcePage.java @@ -193,11 +193,5 @@ public class DataSourcePage extends NavBarPage implements NavBarPage.NavBarItem }) private WebElement inputZeppelinRestEndpoint; - @FindBys({ - @FindBy(className = "input-kubeConfig"), - @FindBy(tagName = "textarea"), - }) - private WebElement inputKubeConfig; - } } diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml index 0660440732..60c08e20f0 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-alert/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml index 13be210c52..65493cbbd7 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-base/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml index b046bef998..a9f02ec8a3 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-common/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml index 552dafec89..adabdac784 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml index ca66e06ca7..8fca570556 100644 --- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml +++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-extract/pom.xml b/dolphinscheduler-extract/pom.xml index 494cbe9678..1bb056dab1 100644 --- a/dolphinscheduler-extract/pom.xml +++ b/dolphinscheduler-extract/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml index d3c24ec695..9cae39f45f 100644 --- a/dolphinscheduler-master/pom.xml +++ b/dolphinscheduler-master/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-meter/pom.xml b/dolphinscheduler-meter/pom.xml index fdd5a2ee08..ea63367630 100644 --- a/dolphinscheduler-meter/pom.xml +++ b/dolphinscheduler-meter/pom.xml @@ -18,7 +18,8 @@ ~ under the License. ~ --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml index 69c964fc64..e4b6d839bb 100644 --- a/dolphinscheduler-microbench/pom.xml +++ b/dolphinscheduler-microbench/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml index 4227d7068b..bfe59d206b 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml index 77005e0b7a..13a8c78f33 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-api/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml index 4805a70c60..9aeda4d31a 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml index 05e7827ed8..f516365a7f 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-jdbc/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml index af1a27e9d7..fd38e11041 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml index 4cec94d9a0..3c44670402 100644 --- a/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml +++ b/dolphinscheduler-registry/dolphinscheduler-registry-plugins/pom.xml @@ -17,7 +17,8 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-registry/pom.xml b/dolphinscheduler-registry/pom.xml index 506ca75acb..79b005e82f 100644 --- a/dolphinscheduler-registry/pom.xml +++ b/dolphinscheduler-registry/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml index 8c987b46d8..30f57eaf50 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml index 6b2bd09067..9b74da292f 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml index 1a775d069b..3baacdef24 100644 --- a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml +++ b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-scheduler-plugin/pom.xml b/dolphinscheduler-scheduler-plugin/pom.xml index 54bde6e518..f6466a842b 100644 --- a/dolphinscheduler-scheduler-plugin/pom.xml +++ b/dolphinscheduler-scheduler-plugin/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index 700798218f..77e0587943 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-spi/pom.xml b/dolphinscheduler-spi/pom.xml index ec3895cefb..05cfac871c 100644 --- a/dolphinscheduler-spi/pom.xml +++ b/dolphinscheduler-spi/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java index e7ebbeee0a..2dd8958924 100644 --- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java +++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java @@ -53,9 +53,7 @@ public enum DbType { HANA(22, "hana"), DORIS(23, "doris"), ZEPPELIN(24, "zeppelin"), - SAGEMAKER(25, "sagemaker"), - - K8S(26, "k8s"); + SAGEMAKER(25, "sagemaker"); private static final Map DB_TYPE_MAP = Arrays.stream(DbType.values()).collect(toMap(DbType::getCode, Functions.identity())); @EnumValue diff --git a/dolphinscheduler-standalone-server/pom.xml b/dolphinscheduler-standalone-server/pom.xml index 508ed91042..9ad0151ce0 100644 --- a/dolphinscheduler-standalone-server/pom.xml +++ b/dolphinscheduler-standalone-server/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml index b848406240..8b739200ed 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-abs/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml index a0c23297eb..70fbb3504e 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml index b9ec5c4b36..0fab9ea4b6 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml index ba4a93b68f..eaa2b215b1 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-gcs/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml index ecec59aa53..c7cbb4b9cc 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml index 8ca3db7e86..9b621b24ab 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-obs/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml index 75b139e348..e469af063d 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-oss/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml index f70c828687..c8d27b6ce2 100644 --- a/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml +++ b/dolphinscheduler-storage-plugin/dolphinscheduler-storage-s3/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-storage-plugin/pom.xml b/dolphinscheduler-storage-plugin/pom.xml index 4ecb9f5ef2..865ad130d4 100644 --- a/dolphinscheduler-storage-plugin/pom.xml +++ b/dolphinscheduler-storage-plugin/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-all-prune/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-all-prune/pom.xml index 632a0e7daa..e50fde488c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-all-prune/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-all-prune/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml index f24accdb6c..5e2ef05abf 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml index 903a6d8de5..f841a98217 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/pom.xml @@ -15,7 +15,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.apache.dolphinscheduler diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java index 4138e5465f..aa5bf62fe2 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java @@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.plugin.task.api; import java.io.Serializable; -import lombok.Data; +import lombok.Value; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,18 +27,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * k8s Task ExecutionContext */ -@Data +@Value public class K8sTaskExecutionContext implements Serializable { private String configYaml; private String namespace; - private String connectionParams; - - public K8sTaskExecutionContext() { - } - @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) public K8sTaskExecutionContext( @JsonProperty("configYaml") String configYaml, @@ -52,7 +47,6 @@ public class K8sTaskExecutionContext implements Serializable { return "K8sTaskExecutionContext{" + "namespace=" + namespace + ", configYaml='" + configYaml + '\'' - + ", connectionParams='" + connectionParams + '\'' + '}'; } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskMainParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskMainParameters.java index 8adc912161..a6c4703f10 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskMainParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskMainParameters.java @@ -34,6 +34,7 @@ public class K8sTaskMainParameters { private String args; private String pullSecret; private String namespaceName; + private String clusterName; private String imagePullPolicy; private double minCpuCores; private double minMemorySpace; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java index 6ca1be7d7a..a57eececf5 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java @@ -18,12 +18,9 @@ package org.apache.dolphinscheduler.plugin.task.api.parameters; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; -import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; import org.apache.commons.collections4.CollectionUtils; @@ -89,16 +86,6 @@ public abstract class AbstractParameters implements IParameters { return localParametersMaps; } - public K8sTaskExecutionContext generateK8sTaskExecutionContext(ResourceParametersHelper parametersHelper, - int datasource) { - DataSourceParameters dataSourceParameters = - (DataSourceParameters) parametersHelper.getResourceParameters(ResourceType.DATASOURCE, datasource); - K8sTaskExecutionContext k8sTaskExecutionContext = new K8sTaskExecutionContext(); - k8sTaskExecutionContext.setConnectionParams( - Objects.nonNull(dataSourceParameters) ? dataSourceParameters.getConnectionParams() : null); - return k8sTaskExecutionContext; - } - /** * get input local parameters map if the param direct is IN * @return parameters map diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java index 4f045abe19..ba9f6498af 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java @@ -17,11 +17,9 @@ package org.apache.dolphinscheduler.plugin.task.api.parameters; -import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType; import org.apache.dolphinscheduler.plugin.task.api.model.Label; import org.apache.dolphinscheduler.plugin.task.api.model.NodeSelectorExpression; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; -import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; import org.apache.commons.lang3.StringUtils; @@ -29,13 +27,11 @@ import java.util.ArrayList; import java.util.List; import lombok.Data; -import lombok.extern.slf4j.Slf4j; /** * k8s task parameters */ @Data -@Slf4j public class K8sTaskParameters extends AbstractParameters { private String image; @@ -48,23 +44,14 @@ public class K8sTaskParameters extends AbstractParameters { private double minMemorySpace; private List