This is an automated email from the ASF dual-hosted git repository.
linying pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new d0d501c01 dependency minor improvement (#2922)
d0d501c01 is described below
commit d0d501c018f1a151d78d59a54d2892800e49ac79
Author: benjobs <[email protected]>
AuthorDate: Fri Aug 4 20:30:32 2023 +0800
dependency minor improvement (#2922)
* dependency minor improvement
* minor improvement
* rename package name
* minor improvement
* dependency minor improvement
* streampark-common dependency minor improvement
---
pom.xml | 32 ++++++
streampark-common/pom.xml | 9 +-
.../org/apache/streampark/common/zio/ZIOExt.scala | 2 +-
.../zio/{LoggerBackend.scala => ZIOLogger.scala} | 15 +--
.../streampark-console-service/pom.xml | 115 ++++++++++-----------
.../console/core/runner/EnvInitializer.java | 2 +-
.../streampark-flink-client-api/pom.xml | 2 +-
.../streampark-flink-connector-base/pom.xml | 2 +-
streampark-flink/streampark-flink-core/pom.xml | 2 +-
.../streampark-flink-kubernetes-v2/pom.xml | 2 +-
.../pom.xml | 24 ++++-
.../flink/kubernetes/v2/FlinkK8sConfig.scala} | 6 +-
.../kubernetes/v2/FlinkMemorySizeParser.scala | 24 ++---
.../flink/kubernetes/v2/FlinkRestRequest.scala | 8 +-
.../streampark/flink/kubernetes/v2/K8sTools.scala | 0
.../kubernetes/v2/fs}/EmbeddedFileServer.scala | 2 +-
.../flink/kubernetes/v2/fs}/FileMirror.scala | 2 +-
.../kubernetes/v2/fs}/FileServerPeerAddress.scala | 2 +-
.../flink/kubernetes/v2/fs}/package.scala | 4 +-
.../flink/kubernetes/v2/model/ClusterMetrics.scala | 0
.../flink/kubernetes/v2/model/FlinkCRStatus.scala | 0
.../kubernetes/v2/model/FlinkDeploymentDef.scala | 0
.../kubernetes/v2/model/FlinkSessionJobDef.scala | 0
.../flink/kubernetes/v2/model/JobDef.scala | 0
.../kubernetes/v2/model/JobSavepointDef.scala | 0
.../kubernetes/v2/model/JobSavepointStatus.scala | 0
.../flink/kubernetes/v2/model/JobSnapshot.scala | 0
.../flink/kubernetes/v2/model/JobState.scala | 0
.../flink/kubernetes/v2/model/JobStatus.scala | 0
.../kubernetes/v2/model/RestSvcEndpoint.scala | 0
.../flink/kubernetes/v2/model/TrackKey.scala | 0
.../kubernetes/v2/observer/DeployCRObserver.scala | 0
.../kubernetes/v2/observer/FlinkK8sObserver.scala | 16 +--
.../v2/observer/RawClusterObserver.scala | 0
.../v2/observer/RestSvcEndpointObserver.scala | 1 +
.../v2/observer/SessionJobCRObserver.scala | 0
.../flink/kubernetes/v2/observer/package.scala | 2 +-
.../flink/kubernetes/v2/operator/CROperator.scala | 13 ++-
.../kubernetes/v2/operator/FlinkK8sOperator.scala | 2 +-
.../flink/kubernetes/v2/operator/OprError.scala} | 2 +-
.../flink/kubernetes/v2/operator/package.scala | 2 +-
.../streampark/flink/kubernetes/v2/package.scala | 0
.../kubernetes/v2/FlinkMemorySizeParserSpec.scala | 0
.../v2/example/UsingEmbeddedFileServer.scala | 2 +-
.../kubernetes/v2/example/UsingObserver.scala | 0
.../kubernetes/v2/example/UsingOperator.scala | 2 +-
.../flink/kubernetes/v2/example/package.scala | 2 +-
.../test/resources/assets/StateMachineExample.jar | Bin 5426478 -> 0 bytes
.../test/resources/assets/flink-faker-0.5.3.jar | Bin 3023193 -> 0 bytes
.../src/test/resources/assets/quick-sql-1.0.jar | Bin 6179 -> 0 bytes
.../streampark-flink-kubernetes/pom.xml | 1 -
streampark-flink/streampark-flink-packer/pom.xml | 2 +-
streampark-flink/streampark-flink-proxy/pom.xml | 1 -
.../streampark-flink-shims-base/pom.xml | 1 -
streampark-flink/streampark-flink-udf/pom.xml | 2 +-
55 files changed, 177 insertions(+), 129 deletions(-)
diff --git a/pom.xml b/pom.xml
index 953d4569a..2706cabc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-common_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
@@ -436,6 +442,32 @@
<scope>test</scope>
</dependency>
+ <!-- ZIO -->
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-logging_${scala.binary.version}</artifactId>
+ <version>${zio-logging.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-streams_${scala.binary.version}</artifactId>
+ <version>${zio.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-concurrent_${scala.binary.version}</artifactId>
+ <version>${zio.version}</version>
+ </dependency>
+
+ <!-- pprint -->
+ <dependency>
+ <groupId>com.lihaoyi</groupId>
+ <artifactId>pprint_${scala.binary.version}</artifactId>
+ <version>${pprint.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/streampark-common/pom.xml b/streampark-common/pom.xml
index b936b82ca..64694d942 100644
--- a/streampark-common/pom.xml
+++ b/streampark-common/pom.xml
@@ -132,26 +132,26 @@
<dependency>
<groupId>dev.zio</groupId>
<artifactId>zio-logging_${scala.binary.version}</artifactId>
- <version>${zio-logging.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>dev.zio</groupId>
<artifactId>zio-streams_${scala.binary.version}</artifactId>
- <version>${zio.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>dev.zio</groupId>
<artifactId>zio-concurrent_${scala.binary.version}</artifactId>
- <version>${zio.version}</version>
+ <optional>true</optional>
</dependency>
<!-- pprint -->
<dependency>
<groupId>com.lihaoyi</groupId>
<artifactId>pprint_${scala.binary.version}</artifactId>
- <version>${pprint.version}</version>
+ <optional>true</optional>
</dependency>
</dependencies>
@@ -184,6 +184,7 @@
<artifactSet>
<includes>
<include>com.beachape:*</include>
+ <include>com.lihaoyi:*</include>
<include>io.netty:netty-resolver</include>
</includes>
</artifactSet>
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOExt.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOExt.scala
index 0a6ad0646..6fb546c65 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOExt.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOExt.scala
@@ -28,7 +28,7 @@ object ZIOExt {
@inline def unsafeRun[E, A](zio: IO[E, A]): A = Unsafe.unsafe {
implicit u =>
Runtime.default.unsafe
- .run(zio.provideLayer(Runtime.removeDefaultLoggers >>>
LoggerBackend.default))
+ .run(zio.provideLayer(Runtime.removeDefaultLoggers >>>
ZIOLogger.default))
.getOrThrowFiberFailure()
}
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/zio/LoggerBackend.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOLogger.scala
similarity index 90%
rename from
streampark-common/src/main/scala/org/apache/streampark/common/zio/LoggerBackend.scala
rename to
streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOLogger.scala
index 4ad4979cf..616c0c0fb 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/zio/LoggerBackend.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/zio/ZIOLogger.scala
@@ -24,8 +24,8 @@ import zio.logging.LoggerNameExtractor
import scala.collection.concurrent.TrieMap
-/** ZIO logging Backend that bridging to
[[org.apache.streampark.common.util.Logger]] */
-object LoggerBackend {
+/** ZIOLogger that bridging to [[org.apache.streampark.common.util.Logger]] */
+object ZIOLogger {
lazy val default: ZLayer[Any, Nothing, Unit] =
Runtime.addLogger(provideLogger())
@@ -46,14 +46,14 @@ object LoggerBackend {
def debug(msg: String): Unit = super.logDebug(msg)
}
- private def provideLogger(): ZLogger[String, Unit] = (
+ private[this] def provideLogger(): ZLogger[String, Unit] = (
trace: Trace,
- fiberId: FiberId,
+ _: FiberId,
logLevel: LogLevel,
message: () => String,
- cause: Cause[Any],
- context: FiberRefs,
- spans: List[LogSpan],
+ _: Cause[Any],
+ _: FiberRefs,
+ _: List[LogSpan],
annotations: Map[String, String]) => {
val loggerName =
@@ -73,6 +73,7 @@ object LoggerBackend {
case LogLevel.Warning => logger.warn(msg)
case LogLevel.Error => logger.error(msg)
case LogLevel.Fatal => logger.error(msg)
+ case _ =>
}
}
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index 3b1b242a3..f88f57aa3 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -127,17 +127,6 @@
</dependency>
<!--spring-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -160,24 +149,45 @@
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
+ <artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
+ <artifactId>spring-boot-starter-quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.mchange</groupId>
+ <artifactId>mchange-commons-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap-core</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- springboot end -->
+
+
<!-- shiro-spring -->
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -192,62 +202,43 @@
</dependency>
<!-- pac4j for SSO-->
- <dependency>
- <groupId>io.buji</groupId>
- <artifactId>buji-pac4j</artifactId>
- <version>${bujiVersion}</version>
- </dependency>
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-core</artifactId>
<version>${pac4jVersion}</version>
</dependency>
- <dependency>
- <groupId>org.pac4j</groupId>
- <artifactId>pac4j-springboot</artifactId>
- <version>${pac4jVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-oauth</artifactId>
<version>${pac4jVersion}</version>
</dependency>
+
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-oidc</artifactId>
<version>${pac4jVersion}</version>
</dependency>
- <!-- spring cache -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- </dependency>
-
- <!-- aop -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
+ <groupId>io.buji</groupId>
+ <artifactId>buji-pac4j</artifactId>
+ <version>${bujiVersion}</version>
</dependency>
- <!-- quartz -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-quartz</artifactId>
+ <groupId>org.pac4j</groupId>
+ <artifactId>pac4j-springboot</artifactId>
+ <version>${pac4jVersion}</version>
<exclusions>
<exclusion>
- <groupId>com.mchange</groupId>
- <artifactId>mchange-commons-java</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
+
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
@@ -282,6 +273,7 @@
<version>${postgresql.version}</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -344,7 +336,6 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -367,7 +358,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-kubernetes-engine_${scala.binary.version}</artifactId>
+
<artifactId>streampark-flink-kubernetes-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -414,18 +405,6 @@
</dependency>
<!--Test dependencies start.-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
@@ -456,6 +435,22 @@
<artifactId>force-shading</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-logging_${scala.binary.version}</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-streams_${scala.binary.version}</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-concurrent_${scala.binary.version}</artifactId>
+ </dependency>
+
</dependencies>
<build>
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
index 011218f90..c6cc24ed8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/EnvInitializer.java
@@ -30,7 +30,7 @@ import org.apache.streampark.common.zio.ZIOExt;
import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.core.entity.FlinkEnv;
import org.apache.streampark.console.core.service.SettingService;
-import org.apache.streampark.flink.kubernetes.v2.httpfs.EmbeddedFileServer;
+import org.apache.streampark.flink.kubernetes.v2.fs.EmbeddedFileServer;
import org.apache.commons.lang3.StringUtils;
diff --git
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
index 175d39bcf..e3f4fa74c 100644
---
a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
+++
b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml
index 9cc53cdaa..0679820ea 100644
---
a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml
+++
b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/streampark-flink/streampark-flink-core/pom.xml
b/streampark-flink/streampark-flink-core/pom.xml
index 969ffac2f..ea777a732 100644
--- a/streampark-flink/streampark-flink-core/pom.xml
+++ b/streampark-flink/streampark-flink-core/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/streampark-flink/streampark-flink-kubernetes-v2/pom.xml
b/streampark-flink/streampark-flink-kubernetes-v2/pom.xml
index f39d85961..cb9db9502 100644
--- a/streampark-flink/streampark-flink-kubernetes-v2/pom.xml
+++ b/streampark-flink/streampark-flink-kubernetes-v2/pom.xml
@@ -34,7 +34,7 @@
<modules>
<module>streampark-flink-kubernetes-crd</module>
- <module>streampark-flink-kubernetes-engine</module>
+ <module>streampark-flink-kubernetes-core</module>
</modules>
<build>
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/pom.xml
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml
similarity index 84%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/pom.xml
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml
index e582bdaad..ffc29b2d0 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/pom.xml
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/pom.xml
@@ -25,8 +25,8 @@
<version>2.2.0-SNAPSHOT</version>
</parent>
-
<artifactId>streampark-flink-kubernetes-engine_${scala.binary.version}</artifactId>
- <name>StreamPark : Flink Kubernetes Integration Engine</name>
+
<artifactId>streampark-flink-kubernetes-core_${scala.binary.version}</artifactId>
+ <name>StreamPark : Flink Kubernetes Integration Core</name>
<properties>
<zio-http.version>3.0.0-RC2</zio-http.version>
@@ -42,7 +42,24 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-logging_${scala.binary.version}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-streams_${scala.binary.version}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dev.zio</groupId>
+ <artifactId>zio-concurrent_${scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
@@ -58,6 +75,7 @@
<artifactId>kubernetes-client</artifactId>
<version>${fabric8.version}</version>
</dependency>
+
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>generator-annotations</artifactId>
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/Config.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala
similarity index 96%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/Config.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala
index 945dcd8cf..10d96dce8 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/Config.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkK8sConfig.scala
@@ -19,19 +19,19 @@ package org.apache.streampark.flink.kubernetes.v2
import org.apache.streampark.common.conf.{InternalOption, Workspace}
-object Config {
+object FlinkK8sConfig {
// ----- embedded http file server config -----
val EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR: InternalOption =
InternalOption(
- key = "streampark.flink-k8s.httpfs.mirror-dir",
+ key = "streampark.flink-k8s.fs.mirror-dir",
defaultValue = s"${Workspace.local.WORKSPACE}/mirror",
classType = classOf[String],
description = "Local mirror directory for embedded file server"
)
val EMBEDDED_HTTP_FILE_SERVER_PORT: InternalOption = InternalOption(
- key = "streampark.flink-k8s.httpfs.port",
+ key = "streampark.flink-k8s.fs-server.port",
defaultValue = 10030,
classType = classOf[Integer],
description = "Port of the embedded http file server"
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
similarity index 66%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
index 758c43eb0..bc0099102 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParser.scala
@@ -24,15 +24,12 @@ object FlinkMemorySizeParser {
private val pattern = raw"(\d+)\s*([a-zA-Z]+)".r
def parse(text: String): Option[MemorySize] = Try {
- val trimmed = text.trim
- if (trimmed.isEmpty) return None
-
- pattern.findFirstMatchIn(text) match {
+ pattern.findFirstMatchIn(text.trim) match {
case None => None
case Some(matched) =>
val size = matched.group(1).toLong
val unit = matched.group(2)
- Unit.all.find(u => u.units.contains(unit)) match {
+ Unit.all.find(_.units.contains(unit.toLowerCase)) match {
case None => None
case Some(hitUnit) => Some(MemorySize(size * hitUnit.multiplier))
}
@@ -47,14 +44,15 @@ object FlinkMemorySizeParser {
def tebiBytes: Long = bytes >> 40
}
- sealed abstract class UnitADT(val units: Array[String], val multiplier: Long)
- object Unit {
- val all = Array(Bytes, KiloBytes, MegaBytes, GigaBytes, TeraBytes)
- case object Bytes extends UnitADT(Array("b", "bytes"), 1L)
- case object KiloBytes extends UnitADT(Array("k", "kb", "kibibytes"), 1024L)
- case object MegaBytes extends UnitADT(Array("m", "mb", "mebibytes"), 1024L
* 1024L)
- case object GigaBytes extends UnitADT(Array("g", "gb", "gibibytes"), 1024L
* 1024L * 1024L)
- case object TeraBytes extends UnitADT(Array("t", "tb", "tebibytes"), 1024L
* 1024L * 1024L * 1024L)
+ private[this] object Unit {
+ sealed abstract class Unit(val units: Array[String], val multiplier: Long)
+
+ lazy val all: Array[Unit] = Array(Bytes, KiloBytes, MegaBytes, GigaBytes,
TeraBytes)
+ case object Bytes extends Unit(Array("b", "bytes"), 1L)
+ case object KiloBytes extends Unit(Array("k", "kb", "kibibytes"), 1024L)
+ case object MegaBytes extends Unit(Array("m", "mb", "mebibytes"), 1024L *
1024L)
+ case object GigaBytes extends Unit(Array("g", "gb", "gibibytes"), 1024L *
1024L * 1024L)
+ case object TeraBytes extends Unit(Array("t", "tb", "tebibytes"), 1024L *
1024L * 1024L * 1024L)
}
}
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
similarity index 97%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
index c96e88d27..9980ed512 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/FlinkRestRequest.scala
@@ -43,7 +43,7 @@ case class FlinkRestRequest(restUrl: String) {
def listJobOverviewInfo: IO[Throwable, Vector[JobOverviewInfo]] =
for {
res <- Client.request(s"$restUrl/jobs/overview")
- rs <- res.body.asJson[JobOverviewRsp]
+ rs <- res.body.asJson[JobOverviewResp]
} yield rs.jobs
/**
@@ -147,10 +147,10 @@ object FlinkRestRequest {
// --- Flink rest api models ---
- case class JobOverviewRsp(jobs: Vector[JobOverviewInfo])
+ case class JobOverviewResp(jobs: Vector[JobOverviewInfo])
- object JobOverviewRsp {
- implicit val codec: JsonCodec[JobOverviewRsp] =
DeriveJsonCodec.gen[JobOverviewRsp]
+ object JobOverviewResp {
+ implicit val codec: JsonCodec[JobOverviewResp] =
DeriveJsonCodec.gen[JobOverviewResp]
}
case class JobOverviewInfo(
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/K8sTools.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/K8sTools.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/K8sTools.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/K8sTools.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/EmbeddedFileServer.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/EmbeddedFileServer.scala
similarity index 96%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/EmbeddedFileServer.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/EmbeddedFileServer.scala
index ff16bc607..05d4badec 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/EmbeddedFileServer.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/EmbeddedFileServer.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.flink.kubernetes.v2.httpfs
+package org.apache.streampark.flink.kubernetes.v2.fs
import org.apache.streampark.common.zio.ZIOExt.UIOOps
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileMirror.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileMirror.scala
similarity index 97%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileMirror.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileMirror.scala
index 79df265ef..a3cdc4a37 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileMirror.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileMirror.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.flink.kubernetes.v2.httpfs
+package org.apache.streampark.flink.kubernetes.v2.fs
import zio.{IO, UIO, ZIO}
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileServerPeerAddress.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileServerPeerAddress.scala
similarity index 98%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileServerPeerAddress.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileServerPeerAddress.scala
index 3658f41b4..477a7a9bb 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/FileServerPeerAddress.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/FileServerPeerAddress.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.streampark.flink.kubernetes.v2.httpfs
+package org.apache.streampark.flink.kubernetes.v2.fs
import org.apache.streampark.common.zio.ZIOExt.{unsafeRun, UIOOps}
import org.apache.streampark.flink.kubernetes.v2.K8sTools.{newK8sClient,
usingK8sClient}
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/package.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/package.scala
similarity index 87%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/package.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/package.scala
index e5382cd5e..21480e6a6 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/httpfs/package.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/fs/package.scala
@@ -18,9 +18,9 @@
package org.apache.streampark.flink.kubernetes.v2
import org.apache.streampark.common.conf.InternalConfigHolder
-import
org.apache.streampark.flink.kubernetes.v2.Config.{EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR,
EMBEDDED_HTTP_FILE_SERVER_PORT}
+import
org.apache.streampark.flink.kubernetes.v2.FlinkK8sConfig.{EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR,
EMBEDDED_HTTP_FILE_SERVER_PORT}
-package object httpfs {
+package object fs {
lazy val localMirrorDir: String =
InternalConfigHolder.get(EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR)
lazy val fileServerPort: Int =
InternalConfigHolder.get(EMBEDDED_HTTP_FILE_SERVER_PORT)
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/ClusterMetrics.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/ClusterMetrics.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/ClusterMetrics.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/ClusterMetrics.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkCRStatus.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkCRStatus.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkCRStatus.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkCRStatus.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkDeploymentDef.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkDeploymentDef.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkDeploymentDef.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkDeploymentDef.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkSessionJobDef.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkSessionJobDef.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkSessionJobDef.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/FlinkSessionJobDef.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobDef.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobDef.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobDef.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobDef.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointDef.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointDef.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointDef.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointDef.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointStatus.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointStatus.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointStatus.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSavepointStatus.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSnapshot.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSnapshot.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSnapshot.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobSnapshot.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobState.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobState.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobState.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobState.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobStatus.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobStatus.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobStatus.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/JobStatus.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/RestSvcEndpoint.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/RestSvcEndpoint.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/RestSvcEndpoint.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/RestSvcEndpoint.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/TrackKey.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/TrackKey.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/TrackKey.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/model/TrackKey.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/DeployCRObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/DeployCRObserver.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/DeployCRObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/DeployCRObserver.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
similarity index 93%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
index a355be3d3..ee23bd49d 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/FlinkK8sObserver.scala
@@ -131,10 +131,10 @@ object FlinkK8sObserver extends FlinkK8sObserver {
for {
_ <- key match {
- case ApplicationJobKey(id, ns, name) =>
trackCluster(ns, name)
- case SessionJobKey(id, ns, name, clusterName) =>
trackSessionJob(ns, name, clusterName)
- case UnmanagedSessionJobKey(id, clusterNs, clusterId, jid) =>
trackCluster(clusterNs, clusterId)
- case ClusterKey(id, ns, name) =>
trackCluster(ns, name)
+ case ApplicationJobKey(_, ns, name) =>
trackCluster(ns, name)
+ case SessionJobKey(_, ns, name, clusterName) =>
trackSessionJob(ns, name, clusterName)
+ case UnmanagedSessionJobKey(_, clusterNs, clusterId, _) =>
trackCluster(clusterNs, clusterId)
+ case ClusterKey(_, ns, name) =>
trackCluster(ns, name)
}
_ <- trackedKeys.add(key).unit
_ <- logInfo(s"Start watching Flink resource: $key")
@@ -183,10 +183,10 @@ object FlinkK8sObserver extends FlinkK8sObserver {
for {
_ <- key match {
- case ApplicationJobKey(id, ns, name) =>
unTrackCluster(ns, name)
- case SessionJobKey(id, ns, name, clusterName) =>
unTrackSessionJob(ns, name)
- case ClusterKey(id, ns, name) =>
unTrackPureCluster(ns, name)
- case UnmanagedSessionJobKey(id, clusterNs, clusterName, jid) =>
+ case ApplicationJobKey(_, ns, name) =>
unTrackCluster(ns, name)
+ case SessionJobKey(_, ns, name, _) =>
unTrackSessionJob(ns, name)
+ case ClusterKey(_, ns, name) =>
unTrackPureCluster(ns, name)
+ case UnmanagedSessionJobKey(_, clusterNs, clusterName, _) =>
unTrackUnmanagedSessionJob(clusterNs, clusterName)
}
_ <- trackedKeys.remove(key)
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RawClusterObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RawClusterObserver.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RawClusterObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RawClusterObserver.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
similarity index 99%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
index ff97e2c5a..b38d605a3 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/RestSvcEndpointObserver.scala
@@ -73,6 +73,7 @@ case class RestSvcEndpointObserver(restSvcEndpointSnaps:
ConcurrentMap[(Namespac
.find(_.getPort == 8081)
.map(_.getTargetPort.getIntVal.toInt)
.getOrElse(8081)
+
Some(RestSvcEndpoint(namespace, name, port, clusterIP))
}
.mapZIO {
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/SessionJobCRObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/SessionJobCRObserver.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/SessionJobCRObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/SessionJobCRObserver.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
similarity index 96%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
index 0f1e6dca0..97e8ecaab 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/observer/package.scala
@@ -18,7 +18,7 @@
package org.apache.streampark.flink.kubernetes.v2
import org.apache.streampark.common.conf.InternalConfigHolder
-import org.apache.streampark.flink.kubernetes.v2.Config._
+import org.apache.streampark.flink.kubernetes.v2.FlinkK8sConfig._
import
org.apache.streampark.flink.kubernetes.v2.observer.AccessFlinkRestType.AccessFlinkRestType
import zio.{durationLong, Duration}
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
similarity index 97%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
index 6cefcf517..e87da3da6 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/CROperator.scala
@@ -19,7 +19,7 @@ package org.apache.streampark.flink.kubernetes.v2.operator
import org.apache.streampark.flink.kubernetes.v2.{pathLastSegment, yamlMapper}
import org.apache.streampark.flink.kubernetes.v2.K8sTools.usingK8sClient
-import org.apache.streampark.flink.kubernetes.v2.httpfs.FileMirror
+import org.apache.streampark.flink.kubernetes.v2.fs.FileMirror
import org.apache.streampark.flink.kubernetes.v2.model.{FlinkDeploymentDef,
FlinkSessionJobDef, JobDef}
import org.apache.streampark.flink.kubernetes.v2.observer.FlinkK8sObserver
@@ -30,6 +30,7 @@ import zio.stream.ZStream
import java.util
+import scala.collection.convert.ImplicitConversions._
import scala.jdk.CollectionConverters._
/**
@@ -157,7 +158,8 @@ object CROperator extends CROperator {
// handle initContainers
val initContainers: util.List[Container] =
Option(spec.getInitContainers).getOrElse(new util.ArrayList())
- val libLoaderInitContainer = new ContainerBuilder()
+
+ val libLoaderInitContainer = new ContainerBuilder()
.withName("userlib-loader")
.withImage("busybox:1.35.0")
.withCommand(
@@ -171,7 +173,9 @@ object CROperator extends CROperator {
.build
)
.build
+
initContainers.add(libLoaderInitContainer)
+
spec.setInitContainers(initContainers)
// handle containers
@@ -185,10 +189,10 @@ object CROperator extends CROperator {
.withSubPath(jarName)
.build)
.toList
- .asJava
val containers: util.List[Container] =
Option(spec.getContainers).getOrElse(new util.ArrayList())
- containers.asScala.zipWithIndex
+
+ containers.zipWithIndex
.find { case (e, _) => e.getName == "flink-main-container" }
.map { case (e, idx) =>
val volMounts = Option(e.getVolumeMounts)
@@ -207,6 +211,7 @@ object CROperator extends CROperator {
.withVolumeMounts(flinkMainContainerVolMounts)
.build)
)
+
spec.setContainers(containers)
// handle volumes
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
similarity index 99%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
index b9e0eac00..d07b60540 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/FlinkK8sOperator.scala
@@ -23,7 +23,7 @@ import
org.apache.streampark.flink.kubernetes.v2.FlinkRestRequest.{StopJobSptReq
import org.apache.streampark.flink.kubernetes.v2.model._
import org.apache.streampark.flink.kubernetes.v2.model.TrackKey._
import org.apache.streampark.flink.kubernetes.v2.observer.FlinkK8sObserver
-import org.apache.streampark.flink.kubernetes.v2.operator.OprErr._
+import org.apache.streampark.flink.kubernetes.v2.operator.OprError._
import zio.{durationInt, IO, Schedule, ZIO}
import zio.stream.ZStream
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprErr.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprError.scala
similarity index 98%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprErr.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprError.scala
index f33623b68..daf8b8a03 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprErr.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/OprError.scala
@@ -17,7 +17,7 @@
package org.apache.streampark.flink.kubernetes.v2.operator
-object OprErr {
+object OprError {
case class UnsupportedAction(msg: String) extends Exception("Unsupported
action: " + msg)
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
similarity index 92%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
index 1a37f412b..c2bd7b0f0 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/operator/package.scala
@@ -18,7 +18,7 @@
package org.apache.streampark.flink.kubernetes.v2
import org.apache.streampark.common.conf.InternalConfigHolder
-import org.apache.streampark.flink.kubernetes.v2.Config.LOG_FLINK_CR_YAML
+import
org.apache.streampark.flink.kubernetes.v2.FlinkK8sConfig.LOG_FLINK_CR_YAML
/**
* Notes:
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/package.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/package.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/main/scala/org/apache/streampark/flink/kubernetes/v2/package.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/main/scala/org/apache/streampark/flink/kubernetes/v2/package.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParserSpec.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParserSpec.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParserSpec.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/FlinkMemorySizeParserSpec.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
similarity index 96%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
index c005c1ef2..84b31a569 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingEmbeddedFileServer.scala
@@ -18,7 +18,7 @@
package org.apache.streampark.flink.kubernetes.v2.example
import org.apache.streampark.common.zio.ZIOExt.unsafeRun
-import org.apache.streampark.flink.kubernetes.v2.httpfs.{EmbeddedFileServer,
FileMirror}
+import org.apache.streampark.flink.kubernetes.v2.fs.{EmbeddedFileServer,
FileMirror}
import org.scalatest.{BeforeAndAfterAll, Ignore}
import org.scalatest.wordspec.AnyWordSpecLike
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingObserver.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingObserver.scala
similarity index 100%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingObserver.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingObserver.scala
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
similarity index 99%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
index fba938449..2d110e6a3 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/UsingOperator.scala
@@ -20,7 +20,7 @@ package org.apache.streampark.flink.kubernetes.v2.example
import org.apache.streampark.common.zio.{liftValueAsSome, PrettyStringOps}
import
org.apache.streampark.common.zio.ZIOContainerSubscription.{ConcurrentMapExtension,
RefMapExtension}
import org.apache.streampark.common.zio.ZIOExt.{unsafeRun, IOOps, ZStreamOps}
-import org.apache.streampark.flink.kubernetes.v2.httpfs.EmbeddedFileServer
+import org.apache.streampark.flink.kubernetes.v2.fs.EmbeddedFileServer
import org.apache.streampark.flink.kubernetes.v2.model._
import org.apache.streampark.flink.kubernetes.v2.observer.FlinkK8sObserver
import org.apache.streampark.flink.kubernetes.v2.operator.FlinkK8sOperator
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
similarity index 94%
rename from
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
rename to
streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
index d2ed58ec0..e75fb0b21 100644
---
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
+++
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-core/src/test/scala/org/apache/streampark/flink/kubernetes/v2/example/package.scala
@@ -17,7 +17,7 @@
package org.apache.streampark.flink.kubernetes.v2
import org.apache.streampark.common.conf.InternalConfigHolder
-import
org.apache.streampark.flink.kubernetes.v2.Config.EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR
+import
org.apache.streampark.flink.kubernetes.v2.FlinkK8sConfig.EMBEDDED_HTTP_FILE_SERVER_LOCAL_MIRROR_DIR
import org.apache.streampark.flink.kubernetes.v2.example.clearTestAssets
package object example {
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/StateMachineExample.jar
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/StateMachineExample.jar
deleted file mode 100644
index 2a0522c9d..000000000
Binary files
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/StateMachineExample.jar
and /dev/null differ
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/flink-faker-0.5.3.jar
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/flink-faker-0.5.3.jar
deleted file mode 100644
index deca9142e..000000000
Binary files
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/flink-faker-0.5.3.jar
and /dev/null differ
diff --git
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/quick-sql-1.0.jar
b/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/quick-sql-1.0.jar
deleted file mode 100644
index 4545a0b16..000000000
Binary files
a/streampark-flink/streampark-flink-kubernetes-v2/streampark-flink-kubernetes-engine/src/test/resources/assets/quick-sql-1.0.jar
and /dev/null differ
diff --git a/streampark-flink/streampark-flink-kubernetes/pom.xml
b/streampark-flink/streampark-flink-kubernetes/pom.xml
index 0ee290313..b69aae145 100644
--- a/streampark-flink/streampark-flink-kubernetes/pom.xml
+++ b/streampark-flink/streampark-flink-kubernetes/pom.xml
@@ -90,7 +90,6 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/streampark-flink/streampark-flink-packer/pom.xml
b/streampark-flink/streampark-flink-packer/pom.xml
index 61b78f30c..a6e2a0716 100644
--- a/streampark-flink/streampark-flink-packer/pom.xml
+++ b/streampark-flink/streampark-flink-packer/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/streampark-flink/streampark-flink-proxy/pom.xml
b/streampark-flink/streampark-flink-proxy/pom.xml
index fae3d94e7..0021038e6 100644
--- a/streampark-flink/streampark-flink-proxy/pom.xml
+++ b/streampark-flink/streampark-flink-proxy/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml
index 0358d858b..a5cb8a88f 100644
---
a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml
+++
b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
</dependency>
<!--flink base-->
diff --git a/streampark-flink/streampark-flink-udf/pom.xml
b/streampark-flink/streampark-flink-udf/pom.xml
index 5cad3de17..a63be8b44 100644
--- a/streampark-flink/streampark-flink-udf/pom.xml
+++ b/streampark-flink/streampark-flink-udf/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.streampark</groupId>
<artifactId>streampark-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>commons-cli</groupId>
