From 5ff55b1caf109ce1da44500598dfaf4e85ef1caa Mon Sep 17 00:00:00 2001 From: Jan Lukavsky Date: Wed, 8 May 2024 10:43:27 +0200 Subject: [PATCH] [flink] Add documentation for Flink runner versions updates --- .../setup-default-test-properties/test-properties.json | 2 +- sdks/go/examples/wasm/README.md | 2 +- sdks/python/apache_beam/options/pipeline_options.py | 2 +- sdks/typescript/src/apache_beam/runners/flink.ts | 2 +- settings.gradle.kts | 8 ++++++++ .../www/site/content/en/documentation/runners/flink.md | 8 +++++++- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-default-test-properties/test-properties.json b/.github/actions/setup-default-test-properties/test-properties.json index 4a43463eb2f9..fc4302066670 100644 --- a/.github/actions/setup-default-test-properties/test-properties.json +++ b/.github/actions/setup-default-test-properties/test-properties.json @@ -14,7 +14,7 @@ }, "JavaTestProperties": { "SUPPORTED_VERSIONS": ["8", "11", "17", "21"], - "FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17"], + "FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17", "1.18"], "SPARK_VERSIONS": ["2", "3"] }, "GoTestProperties": { diff --git a/sdks/go/examples/wasm/README.md b/sdks/go/examples/wasm/README.md index cb0816588502..e8802bdecb0b 100644 --- a/sdks/go/examples/wasm/README.md +++ b/sdks/go/examples/wasm/README.md @@ -68,7 +68,7 @@ cd $BEAM_HOME Expected output should include the following, from which you acquire the latest flink runner version. ```shell -'flink_versions: 1.14,1.15,1.16,1.17' +'flink_versions: 1.14,1.15,1.16,1.17,1.18' ``` #### 2. Set to the latest flink runner version i.e. 1.16 diff --git a/sdks/python/apache_beam/options/pipeline_options.py b/sdks/python/apache_beam/options/pipeline_options.py index 93cde0cf2d40..04ae94df7897 100644 --- a/sdks/python/apache_beam/options/pipeline_options.py +++ b/sdks/python/apache_beam/options/pipeline_options.py @@ -1591,7 +1591,7 @@ def _add_argparse_args(cls, parser): class FlinkRunnerOptions(PipelineOptions): # These should stay in sync with gradle.properties. - PUBLISHED_FLINK_VERSIONS = ['1.14', '1.15', '1.16', '1.17'] + PUBLISHED_FLINK_VERSIONS = ['1.14', '1.15', '1.16', '1.17', '1.18'] @classmethod def _add_argparse_args(cls, parser): diff --git a/sdks/typescript/src/apache_beam/runners/flink.ts b/sdks/typescript/src/apache_beam/runners/flink.ts index 3b672b48105c..bcccd0b46871 100644 --- a/sdks/typescript/src/apache_beam/runners/flink.ts +++ b/sdks/typescript/src/apache_beam/runners/flink.ts @@ -28,7 +28,7 @@ import { JavaJarService } from "../utils/service"; const MAGIC_HOST_NAMES = ["[local]", "[auto]"]; // These should stay in sync with gradle.properties. -const PUBLISHED_FLINK_VERSIONS = ["1.14", "1.15", "1.16", "1.17"]; +const PUBLISHED_FLINK_VERSIONS = ["1.14", "1.15", "1.16", "1.17", "1.18"]; const defaultOptions = { flinkMaster: "[local]", diff --git a/settings.gradle.kts b/settings.gradle.kts index b369f3fbb978..c3003b8f274d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -121,6 +121,14 @@ include(":runners:core-java") include(":runners:direct-java") include(":runners:extensions-java:metrics") /* Begin Flink Runner related settings */ +/* When updating these versions, please make sure that the following files are updated as well: + * FLINK_VERSIONS in .github/actions/setup-default-test-properties/test-properties.json + * flink_versions in sdks/go/examples/wasm/README.md + * PUBLISHED_FLINK_VERSIONS in sdks/python/apache_beam/options/pipeline_options.py + * PUBLISHED_FLINK_VERSIONS in sdks/typescript/src/apache_beam/runners/flink.ts + * verify versions in website/www/site/content/en/documentation/runners/flink.md + * verify version in sdks/python/apache_beam/runners/interactive/interactive_beam.py + */ // Flink 1.14 include(":runners:flink:1.14") include(":runners:flink:1.14:job-server") diff --git a/website/www/site/content/en/documentation/runners/flink.md b/website/www/site/content/en/documentation/runners/flink.md index 8ecb08e5fe92..53d5819ca933 100644 --- a/website/www/site/content/en/documentation/runners/flink.md +++ b/website/www/site/content/en/documentation/runners/flink.md @@ -200,6 +200,7 @@ Starting with Beam 2.18.0, pre-built Flink Job Service Docker images are availab [Flink 1.15](https://hub.docker.com/r/apache/beam_flink1.15_job_server). [Flink 1.16](https://hub.docker.com/r/apache/beam_flink1.16_job_server). [Flink 1.17](https://hub.docker.com/r/apache/beam_flink1.17_job_server). +[Flink 1.18](https://hub.docker.com/r/apache/beam_flink1.18_job_server). {{< /paragraph >}} @@ -326,9 +327,14 @@ To find out which version of Flink is compatible with Beam please see the table Artifact Id Supported Beam Versions + + 1.18.x + beam-runners-flink-1.18 + ≥ 2.57.0 + 1.17.x - beam-runners-flink-1.16 + beam-runners-flink-1.17 ≥ 2.56.0