[Bug][scaleph-workspace-seatunnel] fix scaleph flink jar and seatunne…

…l job error (#709) * ci: fix paimon docker error and add reusable workflow * fix: fix doris cluster status error * fix: file-fetcher error * fix: flink sql image error * fix: flink job detail state error * fix: seatunnel jdbc sink error * fix: seatunnel jdbc sink error
flowerfine · May 1, 2024 · 92c93a6 · 92c93a6
1 parent b942b53
commit 92c93a6
Show file tree

Hide file tree

Showing 81 changed files with 248 additions and 191 deletions.
diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
@@ -21,9 +21,8 @@ on:
     paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   pull_request:
     paths-ignore: [ 'docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  schedule:
-    - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
   workflow_dispatch:
+  workflow_call:
 
 env:
   HUB: ghcr.io/flowerfine/scaleph

diff --git a/.github/workflows/ci-maven.yml b/.github/workflows/ci-maven.yml
@@ -21,9 +21,8 @@ on:
     paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   push:
     paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  schedule:
-    - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build:

diff --git a/.github/workflows/ci-npm.yml b/.github/workflows/ci-npm.yml
@@ -21,9 +21,8 @@ on:
     paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
   push:
     paths-ignore: ['docs/**', '**/*.md', '**/*.drawio', '**/*.svg' ]
-  schedule:
-    - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,37 @@
+# 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.
+
+name: CI
+
+on:
+  schedule:
+    - cron: '0 20 * * *' # automatic test while every day on 04:00 am at UTC+10
+  workflow_dispatch:
+
+jobs:
+  ## 调用公共和专用存储库中的可重用工作流。
+  ## flowerfine/scaleph/.github/workflows/ci-maven.yml@dev
+  ## 调用同一仓库的工作流
+  ## ./.github/workflows/ci-npm.yml
+
+  build_maven:
+    uses: ./.github/workflows/ci-maven.yml
+
+  build_npm:
+    uses: ./.github/workflows/ci-npm.yml
+
+  build_docker:
+    uses: ./.github/workflows/ci-docker-build.yml
diff --git a/.github/workflows/release-manual-docker-paimon.yml b/.github/workflows/release-manual-docker-paimon.yml
@@ -59,7 +59,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Log in to the Container registry
-        uses: docker/login-action@3
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.HUB }}
           username: ${{ github.actor }}

diff --git a/...i/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java b/...i/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorInstanceController.java
@@ -19,14 +19,14 @@
 package cn.sliew.scaleph.api.controller.ws;
 
 import cn.sliew.scaleph.api.annotation.Logging;
-import cn.sliew.scaleph.application.doris.doris.operator.DorisCluster;
-import cn.sliew.scaleph.application.doris.doris.service.DorisClusterEndpointService;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.DorisClusterFeEndpoint;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorInstanceDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorInstanceUpdateParam;
+import cn.sliew.scaleph.application.doris.operator.DorisCluster;
+import cn.sliew.scaleph.application.doris.service.DorisClusterEndpointService;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.service.dto.DorisClusterFeEndpoint;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorInstanceDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorInstanceUpdateParam;
 import cn.sliew.scaleph.system.model.ResponseVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;

diff --git a/...i/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java b/...i/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisOperatorTemplateController.java
@@ -19,12 +19,12 @@
 package cn.sliew.scaleph.api.controller.ws;
 
 import cn.sliew.scaleph.api.annotation.Logging;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorTemplateService;
-import cn.sliew.scaleph.application.doris.doris.service.dto.WsDorisOperatorTemplateDTO;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateAddParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateListParam;
-import cn.sliew.scaleph.application.doris.doris.service.param.WsDorisOperatorTemplateUpdateParam;
-import cn.sliew.scaleph.application.doris.doris.service.resource.template.DorisTemplate;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorTemplateService;
+import cn.sliew.scaleph.application.doris.service.dto.WsDorisOperatorTemplateDTO;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateAddParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateListParam;
+import cn.sliew.scaleph.application.doris.service.param.WsDorisOperatorTemplateUpdateParam;
+import cn.sliew.scaleph.application.doris.service.resource.template.DorisTemplate;
 import cn.sliew.scaleph.system.model.ResponseVO;
 import cn.sliew.scaleph.system.snowflake.exception.UidGenerateException;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

diff --git a/...n/DorisOperatorInstanceStatusSyncJob.java → ...n/DorisOperatorInstanceStatusSyncJob.java b/...n/DorisOperatorInstanceStatusSyncJob.java → ...n/DorisOperatorInstanceStatusSyncJob.java
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.action;
+package cn.sliew.scaleph.application.doris.action;
 
 import cn.sliew.milky.common.filter.ActionListener;
 import cn.sliew.milky.common.util.JacksonUtil;
-import cn.sliew.scaleph.application.doris.doris.service.WsDorisOperatorInstanceService;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.application.doris.service.WsDorisOperatorInstanceService;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
 import cn.sliew.scaleph.workflow.engine.action.ActionContext;
 import cn.sliew.scaleph.workflow.engine.action.ActionResult;
 import cn.sliew.scaleph.workflow.engine.workflow.AbstractWorkFlow;

diff --git a/...on/doris/doris/operator/DorisCluster.java → ...lication/doris/operator/DorisCluster.java b/...on/doris/doris/operator/DorisCluster.java → ...lication/doris/operator/DorisCluster.java
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator;
+package cn.sliew.scaleph.application.doris.operator;
 
-import cn.sliew.scaleph.application.doris.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.application.doris.operator.status.DorisClusterStatus;
 import cn.sliew.scaleph.config.kubernetes.resource.ResourceLabels;
-import cn.sliew.scaleph.application.doris.doris.operator.status.DorisClusterStatus;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.model.annotation.Group;

diff --git a/.../doris/doris/operator/spec/AdminUser.java → ...cation/doris/operator/spec/AdminUser.java b/.../doris/doris/operator/spec/AdminUser.java → ...cation/doris/operator/spec/AdminUser.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...oris/operator/spec/AutoScalerVersion.java → ...oris/operator/spec/AutoScalerVersion.java b/...oris/operator/spec/AutoScalerVersion.java → ...oris/operator/spec/AutoScalerVersion.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 public enum AutoScalerVersion {
 

diff --git a/...oris/operator/spec/AutoScalingPolicy.java → ...oris/operator/spec/AutoScalingPolicy.java b/...oris/operator/spec/AutoScalingPolicy.java → ...oris/operator/spec/AutoScalingPolicy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...n/doris/doris/operator/spec/BaseSpec.java → ...ication/doris/operator/spec/BaseSpec.java b/...n/doris/doris/operator/spec/BaseSpec.java → ...ication/doris/operator/spec/BaseSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.fabric8.kubernetes.api.model.*;

diff --git a/...ion/doris/doris/operator/spec/BeSpec.java → ...plication/doris/operator/spec/BeSpec.java b/...ion/doris/doris/operator/spec/BeSpec.java → ...plication/doris/operator/spec/BeSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/doris/operator/spec/BrokerSpec.java → ...ation/doris/operator/spec/BrokerSpec.java b/...doris/doris/operator/spec/BrokerSpec.java → ...ation/doris/operator/spec/BrokerSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...ion/doris/doris/operator/spec/CnSpec.java → ...plication/doris/operator/spec/CnSpec.java b/...ion/doris/doris/operator/spec/CnSpec.java → ...plication/doris/operator/spec/CnSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...is/doris/operator/spec/ConfigMapInfo.java → ...on/doris/operator/spec/ConfigMapInfo.java b/...is/doris/operator/spec/ConfigMapInfo.java → ...on/doris/operator/spec/ConfigMapInfo.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...r/spec/ContainerResourceMetricSource.java → ...r/spec/ContainerResourceMetricSource.java b/...r/spec/ContainerResourceMetricSource.java → ...r/spec/ContainerResourceMetricSource.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...tor/spec/CrossVersionObjectReference.java → ...tor/spec/CrossVersionObjectReference.java b/...tor/spec/CrossVersionObjectReference.java → ...tor/spec/CrossVersionObjectReference.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/operator/spec/DorisClusterSpec.java → ...doris/operator/spec/DorisClusterSpec.java b/...doris/operator/spec/DorisClusterSpec.java → ...doris/operator/spec/DorisClusterSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/operator/spec/DorisServicePort.java → ...doris/operator/spec/DorisServicePort.java b/...doris/operator/spec/DorisServicePort.java → ...doris/operator/spec/DorisServicePort.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/.../doris/doris/operator/spec/Endpoints.java → ...cation/doris/operator/spec/Endpoints.java b/.../doris/doris/operator/spec/Endpoints.java → ...cation/doris/operator/spec/Endpoints.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...is/doris/operator/spec/ExportService.java → ...on/doris/operator/spec/ExportService.java b/...is/doris/operator/spec/ExportService.java → ...on/doris/operator/spec/ExportService.java
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
-import cn.sliew.scaleph.common.dict.flink.ServiceExposedType;
 import lombok.Data;
 
 import javax.annotation.Nullable;

diff --git a/...s/operator/spec/ExternalMetricSource.java → ...s/operator/spec/ExternalMetricSource.java b/...s/operator/spec/ExternalMetricSource.java → ...s/operator/spec/ExternalMetricSource.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/.../doris/doris/operator/spec/FeAddress.java → ...cation/doris/operator/spec/FeAddress.java b/.../doris/doris/operator/spec/FeAddress.java → ...cation/doris/operator/spec/FeAddress.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...ion/doris/doris/operator/spec/FeSpec.java → ...plication/doris/operator/spec/FeSpec.java b/...ion/doris/doris/operator/spec/FeSpec.java → ...plication/doris/operator/spec/FeSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/.../doris/doris/operator/spec/HPAPolicy.java → ...cation/doris/operator/spec/HPAPolicy.java b/.../doris/doris/operator/spec/HPAPolicy.java → ...cation/doris/operator/spec/HPAPolicy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/operator/spec/HPAScalingPolicy.java → ...doris/operator/spec/HPAScalingPolicy.java b/...doris/operator/spec/HPAScalingPolicy.java → ...doris/operator/spec/HPAScalingPolicy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...s/operator/spec/HPAScalingPolicyType.java → ...s/operator/spec/HPAScalingPolicyType.java b/...s/operator/spec/HPAScalingPolicyType.java → ...s/operator/spec/HPAScalingPolicyType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 /**
  * HPAScalingPolicyType is the type of the policy which could be used while making scaling decisions.

diff --git a/.../doris/operator/spec/HPAScalingRules.java → .../doris/operator/spec/HPAScalingRules.java b/.../doris/operator/spec/HPAScalingRules.java → .../doris/operator/spec/HPAScalingRules.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...spec/HorizontalPodAutoscalerBehavior.java → ...spec/HorizontalPodAutoscalerBehavior.java b/...spec/HorizontalPodAutoscalerBehavior.java → ...spec/HorizontalPodAutoscalerBehavior.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/operator/spec/HorizontalScaler.java → ...doris/operator/spec/HorizontalScaler.java b/...doris/operator/spec/HorizontalScaler.java → ...doris/operator/spec/HorizontalScaler.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...doris/operator/spec/MetricIdentifier.java → ...doris/operator/spec/MetricIdentifier.java b/...doris/operator/spec/MetricIdentifier.java → ...doris/operator/spec/MetricIdentifier.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import lombok.Data;

diff --git a/...doris/operator/spec/MetricSourceType.java → ...doris/operator/spec/MetricSourceType.java b/...doris/operator/spec/MetricSourceType.java → ...doris/operator/spec/MetricSourceType.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 /**
  * MetricSourceType indicates the type of metric.

diff --git a/...doris/doris/operator/spec/MetricSpec.java → ...ation/doris/operator/spec/MetricSpec.java b/...doris/doris/operator/spec/MetricSpec.java → ...ation/doris/operator/spec/MetricSpec.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import lombok.Data;
 

diff --git a/...ris/doris/operator/spec/MetricTarget.java → ...ion/doris/operator/spec/MetricTarget.java b/...ris/doris/operator/spec/MetricTarget.java → ...ion/doris/operator/spec/MetricTarget.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package cn.sliew.scaleph.application.doris.doris.operator.spec;
+package cn.sliew.scaleph.application.doris.operator.spec;
 
 import io.fabric8.kubernetes.api.model.Quantity;
 import lombok.Data;