This is an automated email from the ASF dual-hosted git repository. gyfora pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push: new 29d0187 [FLINK-28517] Bump Flink version to 1.15.1 29d0187 is described below commit 29d0187a4a03ab0ce06ef40038002bd62b2ef89d Author: Matyas Orhidi <matyas_orh...@apple.com> AuthorDate: Tue Jul 12 13:53:44 2022 +0200 [FLINK-28517] Bump Flink version to 1.15.1 --- docs/content/docs/custom-resource/overview.md | 2 +- examples/basic-session-job.yaml | 4 ++-- examples/flink-sql-runner-example/Dockerfile | 2 +- .../org/apache/flink/kubernetes/operator/FlinkOperatorITCase.java | 2 +- .../apache/flink/kubernetes/operator/service/FlinkServiceTest.java | 4 ---- pom.xml | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docs/content/docs/custom-resource/overview.md b/docs/content/docs/custom-resource/overview.md index f4ea786..180c8cc 100644 --- a/docs/content/docs/custom-resource/overview.md +++ b/docs/content/docs/custom-resource/overview.md @@ -161,7 +161,7 @@ metadata: spec: deploymentName: basic-session-cluster job: - jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.0/flink-examples-streaming_2.12-1.15.0-TopSpeedWindowing.jar + jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.1/flink-examples-streaming_2.12-1.15.1-TopSpeedWindowing.jar parallelism: 4 upgradeMode: stateless ``` diff --git a/examples/basic-session-job.yaml b/examples/basic-session-job.yaml index f4a56a0..f68a5e0 100644 --- a/examples/basic-session-job.yaml +++ b/examples/basic-session-job.yaml @@ -40,7 +40,7 @@ metadata: spec: deploymentName: basic-session-cluster job: - jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.0/flink-examples-streaming_2.12-1.15.0-TopSpeedWindowing.jar + jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.1/flink-examples-streaming_2.12-1.15.1-TopSpeedWindowing.jar parallelism: 4 upgradeMode: stateless @@ -52,7 +52,7 @@ metadata: spec: deploymentName: basic-session-cluster job: - jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.0/flink-examples-streaming_2.12-1.15.0.jar + jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.15.1/flink-examples-streaming_2.12-1.15.1.jar parallelism: 2 upgradeMode: stateless entryClass: org.apache.flink.streaming.examples.statemachine.StateMachineExample diff --git a/examples/flink-sql-runner-example/Dockerfile b/examples/flink-sql-runner-example/Dockerfile index 67bb563..9288f08 100644 --- a/examples/flink-sql-runner-example/Dockerfile +++ b/examples/flink-sql-runner-example/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ################################################################################ -FROM flink:1.15.0 +FROM flink:1.15.1 RUN mkdir /opt/flink/usrlib ADD target/flink-sql-runner-example-*.jar /opt/flink/usrlib/sql-runner.jar diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/FlinkOperatorITCase.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/FlinkOperatorITCase.java index d96847d..038fe2a 100644 --- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/FlinkOperatorITCase.java +++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/FlinkOperatorITCase.java @@ -50,7 +50,7 @@ public class FlinkOperatorITCase { private static final String TEST_NAMESPACE = "flink-operator-test"; private static final String SERVICE_ACCOUNT = "flink-operator"; private static final String CLUSTER_ROLE_BINDING = "flink-operator-cluster-role-binding"; - private static final String FLINK_VERSION = "1.15.0"; + private static final String FLINK_VERSION = "1.15.1"; private static final String IMAGE = String.format("flink:%s", FLINK_VERSION); private static final Logger LOG = LoggerFactory.getLogger(FlinkOperatorITCase.class); private KubernetesClient client; diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/FlinkServiceTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/FlinkServiceTest.java index 21f23d7..aebd574 100644 --- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/FlinkServiceTest.java +++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/FlinkServiceTest.java @@ -292,15 +292,11 @@ public class FlinkServiceTest { "{\"refresh-interval\":3000,\"timezone-name\":\"Coordinated Universal Time\",\"timezone-offset\":0,\"flink-version\":\"1.13.6\",\"flink-revision\":\"b2ca390 @ 2022-02-03T14:54:22+01:00\",\"features\":{\"web-submit\":false}}"; String flink14Response = "{\"refresh-interval\":3000,\"timezone-name\":\"Coordinated Universal Time\",\"timezone-offset\":0,\"flink-version\":\"1.14.4\",\"flink-revision\":\"895c609 @ 2022-02-25T11:57:14+01:00\",\"features\":{\"web-submit\":false,\"web-cancel\":false}}"; - String flink15Response = - "{\"refresh-interval\":3000,\"timezone-name\":\"Coordinated Universal Time\",\"timezone-offset\":0,\"flink-version\":\"1.15.0\",\"flink-revision\":\"3a4c113 @ 2022-04-20T19:50:32+02:00\",\"features\":{\"web-submit\":false,\"web-cancel\":false}}"; var dashboardConfiguration = objectMapper.readValue(flink13Response, CustomDashboardConfiguration.class); dashboardConfiguration = objectMapper.readValue(flink14Response, CustomDashboardConfiguration.class); - dashboardConfiguration = - objectMapper.readValue(flink15Response, CustomDashboardConfiguration.class); } @Test diff --git a/pom.xml b/pom.xml index 68216c2..b407119 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,7 @@ under the License. <fabric8.version>5.12.2</fabric8.version> <lombok.version>1.18.22</lombok.version> - <flink.version>1.15.0</flink.version> - <flink.shaded.version>15.0</flink.shaded.version> + <flink.version>1.15.1</flink.version> <slf4j.version>1.7.36</slf4j.version> <log4j.version>2.17.1</log4j.version>