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

Update to Flink 2.0-preview1 #17773

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

Conversation

reswqa
Copy link
Contributor

@reswqa reswqa commented Oct 22, 2024

The preview release of flink 2.0.

NB. jdk1.8 is no longer supported in flink 2.0

@reswqa reswqa requested a review from a team as a code owner October 22, 2024 10:35
Copy link

Diff for bdc6200:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 97b17af..91a4aab 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,17 +31,27 @@ Architectures: amd64, arm64v8
 GitCommit: f77b347d0a534da0482e692d80f559f47041829e
 Directory: 1.19/scala_2.12-java17-ubuntu
 
-Tags: 1.20.0-scala_2.12-java8, 1.20-scala_2.12-java8, scala_2.12-java8, 1.20.0-java8, 1.20-java8, java8
+Tags: 1.20.0-scala_2.12-java8, 1.20-scala_2.12-java8, 1.20.0-java8, 1.20-java8
 Architectures: amd64, arm64v8
 GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
 Directory: 1.20/scala_2.12-java8-ubuntu
 
-Tags: 1.20.0-scala_2.12-java11, 1.20-scala_2.12-java11, scala_2.12-java11, 1.20.0-scala_2.12, 1.20-scala_2.12, scala_2.12, 1.20.0-java11, 1.20-java11, java11, 1.20.0, 1.20, latest
+Tags: 1.20.0-scala_2.12-java11, 1.20-scala_2.12-java11, 1.20.0-scala_2.12, 1.20-scala_2.12, 1.20.0-java11, 1.20-java11, 1.20.0, 1.20
 Architectures: amd64, arm64v8
 GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
 Directory: 1.20/scala_2.12-java11-ubuntu
 
-Tags: 1.20.0-scala_2.12-java17, 1.20-scala_2.12-java17, scala_2.12-java17, 1.20.0-java17, 1.20-java17, java17
+Tags: 1.20.0-scala_2.12-java17, 1.20-scala_2.12-java17, 1.20.0-java17, 1.20-java17
 Architectures: amd64, arm64v8
 GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
 Directory: 1.20/scala_2.12-java17-ubuntu
+
+Tags: 2.0-preview1-scala_2.12-java11, 2.0-scala_2.12-java11, scala_2.12-java11, 2.0-preview1-scala_2.12, 2.0-scala_2.12, scala_2.12, 2.0-preview1-java11, 2.0-java11, java11, 2.0-preview1, 2.0, latest
+Architectures: amd64, arm64v8
+GitCommit: 3a8ba480ff327674b0a090c6ce417f0437576e92
+Directory: 2.0/scala_2.12-java11-ubuntu
+
+Tags: 2.0-preview1-scala_2.12-java17, 2.0-scala_2.12-java17, scala_2.12-java17, 2.0-preview1-java17, 2.0-java17, java17
+Architectures: amd64, arm64v8
+GitCommit: 3a8ba480ff327674b0a090c6ce417f0437576e92
+Directory: 2.0/scala_2.12-java17-ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 32292d3..17e5d56 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,11 +46,21 @@ flink:1.20.0-scala_2.12
 flink:1.20.0-scala_2.12-java8
 flink:1.20.0-scala_2.12-java11
 flink:1.20.0-scala_2.12-java17
-flink:java8
+flink:2.0
+flink:2.0-java11
+flink:2.0-java17
+flink:2.0-preview1
+flink:2.0-preview1-java11
+flink:2.0-preview1-java17
+flink:2.0-preview1-scala_2.12
+flink:2.0-preview1-scala_2.12-java11
+flink:2.0-preview1-scala_2.12-java17
+flink:2.0-scala_2.12
+flink:2.0-scala_2.12-java11
+flink:2.0-scala_2.12-java17
 flink:java11
 flink:java17
 flink:latest
 flink:scala_2.12
-flink:scala_2.12-java8
 flink:scala_2.12-java11
 flink:scala_2.12-java17
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index dac6d75..834e35d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,6 +4,8 @@ flink:1.18-java17
 flink:1.19
 flink:1.19-java8
 flink:1.19-java17
-flink:java8
+flink:1.20
+flink:1.20-java8
+flink:1.20-java17
 flink:java17
 flink:latest
diff --git a/flink_java17/Dockerfile b/flink_1.20-java17/Dockerfile
similarity index 100%
copy from flink_java17/Dockerfile
copy to flink_1.20-java17/Dockerfile
diff --git a/flink_java8/docker-entrypoint.sh b/flink_1.20-java17/docker-entrypoint.sh
similarity index 100%
rename from flink_java8/docker-entrypoint.sh
rename to flink_1.20-java17/docker-entrypoint.sh
diff --git a/flink_java8/Dockerfile b/flink_1.20-java8/Dockerfile
similarity index 100%
rename from flink_java8/Dockerfile
rename to flink_1.20-java8/Dockerfile
diff --git a/flink_1.19-java17/docker-entrypoint.sh b/flink_1.20-java8/docker-entrypoint.sh
similarity index 100%
copy from flink_1.19-java17/docker-entrypoint.sh
copy to flink_1.20-java8/docker-entrypoint.sh
diff --git a/flink_latest/Dockerfile b/flink_1.20/Dockerfile
similarity index 100%
copy from flink_latest/Dockerfile
copy to flink_1.20/Dockerfile
diff --git a/flink_1.19-java17/docker-entrypoint.sh b/flink_1.20/docker-entrypoint.sh
similarity index 100%
copy from flink_1.19-java17/docker-entrypoint.sh
copy to flink_1.20/docker-entrypoint.sh
diff --git a/flink_java17/Dockerfile b/flink_java17/Dockerfile
index dbc7e7f..35cd97f 100644
--- a/flink_java17/Dockerfile
+++ b/flink_java17/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz.asc \
-    GPG_KEY=B2D64016B940A7E0B9B72E0D7D0528B28037D8BC \
+ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-2.0-preview1/flink-2.0-preview1-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-2.0-preview1/flink-2.0-preview1-bin-scala_2.12.tgz.asc \
+    GPG_KEY=8D56AE6E7082699A4870750EA4E8C4C05EE6861F \
     CHECK_GPG=true
 
 # Prepare environment
@@ -81,22 +81,13 @@ RUN set -ex; \
   chown -R flink:flink .; \
   \
   # Replace default REST/RPC endpoint bind address to use the container's network interface \
-  CONF_FILE="$FLINK_HOME/conf/flink-conf.yaml"; \
-  if [ ! -e "$FLINK_HOME/conf/flink-conf.yaml" ]; then \
   CONF_FILE="${FLINK_HOME}/conf/config.yaml"; \
   /bin/bash "$FLINK_HOME/bin/config-parser-utils.sh" "${FLINK_HOME}/conf" "${FLINK_HOME}/bin" "${FLINK_HOME}/lib" \
     "-repKV" "rest.address,localhost,0.0.0.0" \
     "-repKV" "rest.bind-address,localhost,0.0.0.0" \
     "-repKV" "jobmanager.bind-host,localhost,0.0.0.0" \
     "-repKV" "taskmanager.bind-host,localhost,0.0.0.0" \
-        "-rmKV" "taskmanager.host=localhost"; \
-  else \
-    sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/jobmanager.bind-host: localhost/jobmanager.bind-host: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/taskmanager.bind-host: localhost/taskmanager.bind-host: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i '/taskmanager.host: localhost/d' "$CONF_FILE"; \
-  fi;
+    "-rmKV" "taskmanager.host=localhost";
 
 # Configure container
 COPY docker-entrypoint.sh /
diff --git a/flink_latest/Dockerfile b/flink_latest/Dockerfile
index 18c6ff9..ff1eab5 100644
--- a/flink_latest/Dockerfile
+++ b/flink_latest/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz.asc \
-    GPG_KEY=B2D64016B940A7E0B9B72E0D7D0528B28037D8BC \
+ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-2.0-preview1/flink-2.0-preview1-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-2.0-preview1/flink-2.0-preview1-bin-scala_2.12.tgz.asc \
+    GPG_KEY=8D56AE6E7082699A4870750EA4E8C4C05EE6861F \
     CHECK_GPG=true
 
 # Prepare environment
@@ -81,22 +81,13 @@ RUN set -ex; \
   chown -R flink:flink .; \
   \
   # Replace default REST/RPC endpoint bind address to use the container's network interface \
-  CONF_FILE="$FLINK_HOME/conf/flink-conf.yaml"; \
-  if [ ! -e "$FLINK_HOME/conf/flink-conf.yaml" ]; then \
   CONF_FILE="${FLINK_HOME}/conf/config.yaml"; \
   /bin/bash "$FLINK_HOME/bin/config-parser-utils.sh" "${FLINK_HOME}/conf" "${FLINK_HOME}/bin" "${FLINK_HOME}/lib" \
     "-repKV" "rest.address,localhost,0.0.0.0" \
     "-repKV" "rest.bind-address,localhost,0.0.0.0" \
     "-repKV" "jobmanager.bind-host,localhost,0.0.0.0" \
     "-repKV" "taskmanager.bind-host,localhost,0.0.0.0" \
-        "-rmKV" "taskmanager.host=localhost"; \
-  else \
-    sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/jobmanager.bind-host: localhost/jobmanager.bind-host: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/taskmanager.bind-host: localhost/taskmanager.bind-host: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i '/taskmanager.host: localhost/d' "$CONF_FILE"; \
-  fi;
+    "-rmKV" "taskmanager.host=localhost";
 
 # Configure container
 COPY docker-entrypoint.sh /

Relevant Maintainers:

  • flink: @ApacheFlink

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant