Skip to content

[FLINK-38147] Add Flink 2.1 support #1001

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FLINK-38147] Add Flink 2.1 support #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 3 additions & 49 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ jobs:
http-client: [ "okhttp" ]
java-version: [ "17"]
flink-version:
- "v2_1"
- "v2_0"
- "v1_20"
- "v1_19"
- "v1_18"
uses: ./.github/workflows/e2e.yaml
with:
java-version: ${{ matrix.java-version }}
Expand All @@ -108,11 +108,10 @@ jobs:
strategy:
matrix:
flink-version:
- "v2_1"
- "v2_0"
- "v1_20"
- "v1_19"
- "v1_18"
- "v1_17"
mode:
- "native"
- "standalone"
Expand All @@ -129,16 +128,6 @@ jobs:
test: test_dynamic_config.sh
- mode: standalone
test: test_dynamic_flink_conf.sh
- flink-version: v1_16
test: test_autoscaler.sh
- flink-version: v1_16
test: test_dynamic_config.sh
- flink-version: v1_17
test: test_dynamic_config.sh
- flink-version: v1_18
test: test_dynamic_config.sh
- flink-version: v1_16
test: test_dynamic_flink_conf.sh

uses: ./.github/workflows/e2e.yaml
with:
Expand All @@ -153,11 +142,10 @@ jobs:
strategy:
matrix:
flink-version:
- "v2_1"
- "v2_0"
- "v1_20"
- "v1_18"
- "v1_19"
- "v1_17"
mode:
- "native"
- "standalone"
Expand All @@ -173,40 +161,6 @@ jobs:
- test_snapshot.sh
- test_batch_job.sh
exclude:
- flink-version: v1_16
test: test_autoscaler.sh
- mode: standalone
test: test_autoscaler.sh
- flink-version: v1_16
test: test_dynamic_config.sh
- flink-version: v1_16
test: test_dynamic_flink_conf.sh
- flink-version: v1_16
test: test_flink_operator_ha.sh
- flink-version: v1_16
test: test_snapshot.sh
- flink-version: v1_16
test: test_batch_job.sh
- flink-version: v1_17
test: test_dynamic_config.sh
- flink-version: v1_17
test: test_dynamic_flink_conf.sh
- flink-version: v1_17
test: test_flink_operator_ha.sh
- flink-version: v1_17
test: test_snapshot.sh
- flink-version: v1_17
test: test_batch_job.sh
- flink-version: v1_18
test: test_dynamic_config.sh
- flink-version: v1_18
test: test_dynamic_flink_conf.sh
- flink-version: v1_18
test: test_flink_operator_ha.sh
- flink-version: v1_18
test: test_snapshot.sh
- flink-version: v1_18
test: test_batch_job.sh
- flink-version: v1_19
test: test_snapshot.sh
uses: ./.github/workflows/e2e.yaml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:

EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar"
if [[ ${{ inputs.flink-version }} == v2* ]]; then
EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming/2.0-preview1/flink-examples-streaming-2.0-preview1.jar"
EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming/2.0.0/flink-examples-streaming-2.0.0.jar"
elif [[ "${{ inputs.test }}" == "test_batch_job.sh" ]]; then
EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming/1.20.1/flink-examples-streaming-1.20.1.jar"
fi
Expand Down
2 changes: 2 additions & 0 deletions docs/content/docs/custom-resource/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ This serves as a full reference for FlinkDeployment and FlinkSessionJob custom r
| v1_19 | |
| v1_20 | |
| v2_0 | |
| v2_1 | |
| v2_2 | |
| majorVersion | int | The major integer from the Flink semver. For example for Flink 1.18.1 this would be 1. |
| minorVersion | int | The minor integer from the Flink semver. For example for Flink 1.18.1 this would be 18. |

Expand Down
6 changes: 5 additions & 1 deletion ...perator-api/src/main/java/org/apache/flink/kubernetes/operator/api/spec/FlinkVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,15 @@ public enum FlinkVersion {
/** Deprecated since 1.11 operator release. */
@Deprecated
v1_16(1, 16),
@Deprecated
v1_17(1, 17),
@Deprecated
v1_18(1, 18),
v1_19(1, 19),
v1_20(1, 20),
v2_0(2, 0);
v2_0(2, 0),
v2_1(2, 1),
v2_2(2, 2);

/** The major integer from the Flink semver. For example for Flink 1.18.1 this would be 1. */
private final int majorVersion;
Expand Down
2 changes: 2 additions & 0 deletions helm/flink-kubernetes-operator/crds/flinkdeployments.flink.apache.org-v1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ spec:
- v1_19
- v1_20
- v2_0
- v2_1
- v2_2
type: string
image:
type: string
Expand Down
Loading