Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Flink 1.18 support #31274

Merged
merged 3 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"JavaTestProperties": {
"SUPPORTED_VERSIONS": ["8", "11", "17", "21"],
"FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17", "1.18"],
"FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17"],
"SPARK_VERSIONS": ["2", "3"]
},
"GoTestProperties": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beam_PostCommit_Java_Tpcds_Flink.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,5 @@ jobs:
with:
gradle-command: :sdks:java:testing:tpcds:run
arguments: |
-Ptpcds.runner=:runners:flink:1.18 \
-Ptpcds.runner=:runners:flink:1.17 \
"-Ptpcds.args=${{env.tpcdsBigQueryArgs}} ${{env.tpcdsInfluxDBArgs}} ${{ env.GRADLE_COMMAND_ARGUMENTS }} --queries=${{env.tpcdsQueriesArg}}" \
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: run validatesRunner script
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :runners:flink:1.18:validatesRunner
gradle-command: :runners:flink:1.17:validatesRunner
- name: Archive JUnit Test Results
uses: actions/upload-artifact@v4
if: ${{ !success() }}
Expand Down
1 change: 0 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@

## Highlights

* Added FlinkRunner for Flink 1.18. ([#30789](https://github.com/apache/beam/issues/30789))
* New highly anticipated feature X added to Python SDK ([#X](https://github.com/apache/beam/issues/X)).
* New highly anticipated feature Y added to Java SDK ([#Y](https://github.com/apache/beam/issues/Y)).

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ docker_image_default_repo_root=apache
docker_image_default_repo_prefix=beam_

# supported flink versions
flink_versions=1.14,1.15,1.16,1.17,1.18
flink_versions=1.14,1.15,1.16,1.17
# supported python versions
python_versions=3.8,3.9,3.10,3.11
25 changes: 0 additions & 25 deletions runners/flink/1.18/build.gradle

This file was deleted.

26 changes: 0 additions & 26 deletions runners/flink/1.18/job-server-container/build.gradle

This file was deleted.

31 changes: 0 additions & 31 deletions runners/flink/1.18/job-server/build.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion runners/flink/flink_runner.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ tasks.register("validatesRunnerSickbay", Test) {
}
}

// Generates :runners:flink:1.18:runQuickstartJavaFlinkLocal
// Generates :runners:flink:1.17:runQuickstartJavaFlinkLocal
createJavaExamplesArchetypeValidationTask(type: 'Quickstart', runner: 'FlinkLocal')

tasks.register("examplesIntegrationTest", Test) {
Expand Down
2 changes: 1 addition & 1 deletion sdks/go/examples/stringsplit/stringsplit.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// 1. From a command line, navigate to the top-level beam/ directory and run
// the Flink job server:
//
// ./gradlew :runners:flink:1.18:job-server:runShadow -Djob-host=localhost -Dflink-master=local
// ./gradlew :runners:flink:1.17:job-server:runShadow -Djob-host=localhost -Dflink-master=local
//
// 2. The job server is ready to receive jobs once it outputs a log like the
// following: `JobService started on localhost:8099`. Take note of the endpoint
Expand Down
2 changes: 1 addition & 1 deletion sdks/go/examples/wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,1.18'
'flink_versions: 1.14,1.15,1.16,1.17'
```

#### 2. Set to the latest flink runner version i.e. 1.16
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/options/pipeline_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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', '1.18']
PUBLISHED_FLINK_VERSIONS = ['1.14', '1.15', '1.16', '1.17']

@classmethod
def _add_argparse_args(cls, parser):
Expand Down
2 changes: 1 addition & 1 deletion sdks/typescript/src/apache_beam/runners/flink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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", "1.18"];
const PUBLISHED_FLINK_VERSIONS = ["1.14", "1.15", "1.16", "1.17"];

const defaultOptions = {
flinkMaster: "[local]",
Expand Down
8 changes: 1 addition & 7 deletions website/www/site/content/en/documentation/runners/flink.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ from the [compatibility table](#flink-version-compatibility) below. For example:
{{< highlight java >}}
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-flink-1.16</artifactId>
<artifactId>beam-runners-flink-1.17</artifactId>
<version>{{< param release_latest >}}</version>
</dependency>
{{< /highlight >}}
Expand Down Expand Up @@ -200,7 +200,6 @@ 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 >}}

<!-- TODO(BEAM-10214): Use actual lists here and below. -->
Expand Down Expand Up @@ -327,11 +326,6 @@ To find out which version of Flink is compatible with Beam please see the table
<th>Artifact Id</th>
<th>Supported Beam Versions</th>
</tr>
<tr>
<td>1.18.x</td>
<td>beam-runners-flink-1.18</td>
<td>&ge; 2.57.0</td>
</tr>
<tr>
<td>1.17.x</td>
<td>beam-runners-flink-1.17</td>
Expand Down
Loading