diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c934c2d5e..1819c4850 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -183,6 +183,7 @@ jobs:
flink:
- '1.16'
- '1.17'
+ - '1.18'
flink-archive: [ "" ]
comment: [ "normal" ]
include:
@@ -190,6 +191,10 @@ jobs:
flink: '1.17'
flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.16.1 -Dflink.archive.name=flink-1.16.1-bin-scala_2.12.tgz'
comment: 'verify-on-flink-1.16-binary'
+ - java: 8
+ flink: '1.17'
+ flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.18.0 -Dflink.archive.name=flink-1.18.0-bin-scala_2.12.tgz'
+ comment: 'verify-on-flink-1.18-binary'
steps:
- uses: actions/checkout@v3
- name: Tune Runner VM
diff --git a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
index 7d42aae8c..06165272d 100644
--- a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
+++ b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkEngineUtils.scala
@@ -48,7 +48,7 @@ object FlinkEngineUtils extends Logging {
val EMBEDDED_MODE_CLIENT_OPTIONS: Options = getEmbeddedModeClientOptions(new Options)
- private def SUPPORTED_FLINK_VERSIONS = Set("1.16", "1.17").map(SemanticVersion.apply)
+ private def SUPPORTED_FLINK_VERSIONS = Set("1.16", "1.17", "1.18").map(SemanticVersion.apply)
val FLINK_RUNTIME_VERSION: SemanticVersion = SemanticVersion(EnvironmentInformation.getVersion)
@@ -119,7 +119,7 @@ object FlinkEngineUtils extends Logging {
.build()
.newInstance(flinkConf, commandLines)
.asInstanceOf[DefaultContext]
- } else if (FLINK_RUNTIME_VERSION === "1.17") {
+ } else if (FLINK_RUNTIME_VERSION >= "1.17") {
invokeAs[DefaultContext](
classOf[DefaultContext],
"load",
diff --git a/pom.xml b/pom.xml
index 059bc214b..f03770b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2304,6 +2304,13 @@
+
+ flink-1.18
+
+ 1.18.0
+
+
+
zookeeper-3.6