Skip to content

Commit ff4c730

Browse files
snuyanzinsnuyanzin
authored
[FLINK-33471] Make flink kubernetes operator compilable with jdk21
1 parent c9dde4e commit ff4c730

30 files changed

+153
-63
lines changed

‎.github/workflows/ci.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: test_ci
2727
strategy:
2828
matrix:
29-
java-version: [ 11, 17 ]
29+
java-version: [ 11, 17, 21 ]
3030
steps:
3131
- uses: actions/checkout@v2
3232
- name: Set up JDK ${{ matrix.java-version }}
@@ -73,7 +73,7 @@ jobs:
7373
version: ["v1_18","v1_17","v1_16","v1_15"]
7474
namespace: ["default","flink"]
7575
mode: ["native", "standalone"]
76-
java-version: [ 11, 17 ]
76+
java-version: [ 11, 17, 21 ]
7777
test:
7878
- test_application_kubernetes_ha.sh
7979
- test_application_operations.sh
@@ -114,16 +114,18 @@ jobs:
114114
test: test_dynamic_config.sh
115115
- version: v1_17
116116
test: test_dynamic_config.sh
117-
- version: v1_13
118-
java-version: 17
119-
- version: v1_14
120-
java-version: 17
121117
- version: v1_15
122118
java-version: 17
123119
- version: v1_16
124120
java-version: 17
125121
- version: v1_17
126122
java-version: 17
123+
- version: v1_15
124+
java-version: 21
125+
- version: v1_16
126+
java-version: 21
127+
- version: v1_17
128+
java-version: 21
127129
name: e2e_ci
128130
steps:
129131
- uses: actions/checkout@v2

‎flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/controller/FlinkResourceContext.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,19 @@ protected FlinkService createFlinkService() {
143143
*/
144144
protected abstract Configuration createObserveConfig();
145145

146-
/** @return Cluster deployment mode. */
146+
/**
147+
* @return Cluster deployment mode.
148+
*/
147149
public abstract KubernetesDeploymentMode getDeploymentMode();
148150

149-
/** @return Cluster Flink Version. */
151+
/**
152+
* @return Cluster Flink Version.
153+
*/
150154
public abstract FlinkVersion getFlinkVersion();
151155

152-
/** @return Operator configuration for this resource. */
156+
/**
157+
* @return Operator configuration for this resource.
158+
*/
153159
public FlinkOperatorConfiguration getOperatorConfig() {
154160
if (operatorConfig != null) {
155161
return operatorConfig;

‎flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/EventSourceUtils.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ public static InformerEventSource<Deployment, FlinkDeployment> getDeploymentInfo
4646
EventSourceContext<FlinkDeployment> context) {
4747
final String labelSelector =
4848
Map.of(Constants.LABEL_COMPONENT_KEY, Constants.LABEL_COMPONENT_JOB_MANAGER)
49-
.entrySet().stream()
49+
.entrySet()
50+
.stream()
5051
.map(Object::toString)
5152
.collect(Collectors.joining(","));
5253

@@ -77,7 +78,8 @@ public static InformerEventSource<Deployment, FlinkDeployment> getDeploymentInfo
7778
InformerConfiguration.from(FlinkSessionJob.class, context)
7879
.withSecondaryToPrimaryMapper(
7980
sessionJob ->
80-
context.getPrimaryCache()
81+
context
82+
.getPrimaryCache()
8183
.byIndex(
8284
FLINK_DEPLOYMENT_IDX,
8385
indexKey(
@@ -112,7 +114,8 @@ public static InformerEventSource<Deployment, FlinkDeployment> getDeploymentInfo
112114
InformerConfiguration.from(FlinkDeployment.class, context)
113115
.withSecondaryToPrimaryMapper(
114116
flinkDeployment ->
115-
context.getPrimaryCache()
117+
context
118+
.getPrimaryCache()
116119
.byIndex(
117120
FLINK_SESSIONJOB_IDX,
118121
indexKey(

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/OperatorTestBase.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
import io.javaoperatorsdk.operator.api.reconciler.Context;
3030
import org.junit.jupiter.api.BeforeEach;
3131

32-
/** @link JobStatusObserver unit tests */
32+
/**
33+
* @link JobStatusObserver unit tests
34+
*/
3335
public abstract class OperatorTestBase {
3436

3537
protected Configuration conf = new Configuration();

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/DeploymentRecoveryTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
import static org.junit.jupiter.api.Assertions.assertEquals;
3939
import static org.junit.jupiter.api.Assertions.assertTrue;
4040

41-
/** @link Missing deployment recovery tests */
41+
/**
42+
* @link Missing deployment recovery tests
43+
*/
4244
@EnableKubernetesMockClient(crud = true)
4345
public class DeploymentRecoveryTest {
4446

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FailedDeploymentRestartTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
import static org.apache.flink.kubernetes.operator.config.KubernetesOperatorConfigOptions.OPERATOR_JOB_RESTART_FAILED;
3737
import static org.junit.jupiter.api.Assertions.assertEquals;
3838

39-
/** @link Unhealthy deployment restart tests */
39+
/**
40+
* @link Unhealthy deployment restart tests
41+
*/
4042
@EnableKubernetesMockClient(crud = true)
4143
public class FailedDeploymentRestartTest {
4244
private FlinkConfigManager configManager;

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/RollbackTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
import static org.junit.jupiter.api.Assertions.assertNull;
5252
import static org.junit.jupiter.api.Assertions.assertTrue;
5353

54-
/** @link RollBack logic tests */
54+
/**
55+
* @link RollBack logic tests
56+
*/
5557
@EnableKubernetesMockClient(crud = true)
5658
public class RollbackTest {
5759

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/UnhealthyDeploymentRestartTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
import static org.apache.flink.kubernetes.operator.config.KubernetesOperatorConfigOptions.OPERATOR_CLUSTER_HEALTH_CHECK_RESTARTS_THRESHOLD;
4242
import static org.junit.jupiter.api.Assertions.assertEquals;
4343

44-
/** @link Unhealthy deployment restart tests */
44+
/**
45+
* @link Unhealthy deployment restart tests
46+
*/
4547
@EnableKubernetesMockClient(crud = true)
4648
public class UnhealthyDeploymentRestartTest {
4749

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/health/HealthProbeTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
import static org.junit.jupiter.api.Assertions.assertNotNull;
5252
import static org.junit.jupiter.api.Assertions.assertTrue;
5353

54-
/** @link Health probe unit tests */
54+
/**
55+
* @link Health probe unit tests
56+
*/
5557
@EnableKubernetesMockClient(crud = true)
5658
public class HealthProbeTest {
5759
KubernetesClient client;

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkDeploymentMetricsTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
import static org.junit.jupiter.api.Assertions.assertEquals;
4444
import static org.junit.jupiter.api.Assertions.assertTrue;
4545

46-
/** @link FlinkDeploymentMetrics tests. */
46+
/**
47+
* @link FlinkDeploymentMetrics tests.
48+
*/
4749
public class FlinkDeploymentMetricsTest {
4850

4951
private final Configuration configuration = new Configuration();

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/FlinkSessionJobMetricsTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
import static org.junit.jupiter.api.Assertions.assertEquals;
3030
import static org.junit.jupiter.api.Assertions.assertTrue;
3131

32-
/** @link FlinkSessionJobMetrics tests. */
32+
/**
33+
* @link FlinkSessionJobMetrics tests.
34+
*/
3335
public class FlinkSessionJobMetricsTest {
3436

3537
private final Configuration configuration = new Configuration();

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/metrics/KubernetesOperatorMetricGroupTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232

33-
/** @link KubernetesOperatorMetricGroup tests. */
33+
/**
34+
* @link KubernetesOperatorMetricGroup tests.
35+
*/
3436
public class KubernetesOperatorMetricGroupTest {
3537

3638
@Test

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/deployment/ApplicationObserverTest.java

+42-13
Original file line numberDiff line numberDiff line change
@@ -259,17 +259,26 @@ public void observeSavepoint() throws Exception {
259259
assertEquals(
260260
0,
261261
(int)
262-
kubernetesClient.v1().events()
263-
.inNamespace(deployment.getMetadata().getNamespace()).list()
264-
.getItems().stream()
262+
kubernetesClient
263+
.v1()
264+
.events()
265+
.inNamespace(deployment.getMetadata().getNamespace())
266+
.list()
267+
.getItems()
268+
.stream()
265269
.filter(e -> e.getReason().contains("SavepointError"))
266270
.count());
267271
observer.observe(deployment, readyContext);
268272
assertFalse(SnapshotUtils.savepointInProgress(deployment.getStatus().getJobStatus()));
269273
assertEquals(
270274
1,
271-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
272-
.list().getItems().stream()
275+
kubernetesClient
276+
.v1()
277+
.events()
278+
.inNamespace(deployment.getMetadata().getNamespace())
279+
.list()
280+
.getItems()
281+
.stream()
273282
.filter(e -> e.getReason().contains("SavepointError"))
274283
.count());
275284

@@ -289,8 +298,13 @@ public void observeSavepoint() throws Exception {
289298
assertFalse(SnapshotUtils.savepointInProgress(deployment.getStatus().getJobStatus()));
290299
assertEquals(
291300
1,
292-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
293-
.list().getItems().stream()
301+
kubernetesClient
302+
.v1()
303+
.events()
304+
.inNamespace(deployment.getMetadata().getNamespace())
305+
.list()
306+
.getItems()
307+
.stream()
294308
.filter(e -> e.getReason().contains("SavepointError"))
295309
.filter(
296310
e ->
@@ -301,8 +315,13 @@ public void observeSavepoint() throws Exception {
301315
.count());
302316
assertEquals(
303317
2,
304-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
305-
.list().getItems().stream()
318+
kubernetesClient
319+
.v1()
320+
.events()
321+
.inNamespace(deployment.getMetadata().getNamespace())
322+
.list()
323+
.getItems()
324+
.stream()
306325
.filter(e -> e.getReason().contains("SavepointError"))
307326
.filter(
308327
e ->
@@ -414,8 +433,13 @@ public void observeSavepoint() throws Exception {
414433

415434
assertEquals(
416435
1,
417-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
418-
.list().getItems().stream()
436+
kubernetesClient
437+
.v1()
438+
.events()
439+
.inNamespace(deployment.getMetadata().getNamespace())
440+
.list()
441+
.getItems()
442+
.stream()
419443
.filter(e -> e.getReason().contains("SavepointError"))
420444
.filter(
421445
e ->
@@ -426,8 +450,13 @@ public void observeSavepoint() throws Exception {
426450
.count());
427451
assertEquals(
428452
1,
429-
kubernetesClient.v1().events().inNamespace(deployment.getMetadata().getNamespace())
430-
.list().getItems().stream()
453+
kubernetesClient
454+
.v1()
455+
.events()
456+
.inNamespace(deployment.getMetadata().getNamespace())
457+
.list()
458+
.getItems()
459+
.stream()
431460
.filter(e -> e.getReason().contains("SavepointError"))
432461
.filter(
433462
e ->

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerTest.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@
126126
import static org.junit.jupiter.api.Assertions.assertTrue;
127127
import static org.junit.jupiter.api.Assertions.fail;
128128

129-
/** @link JobStatusObserver unit tests */
129+
/**
130+
* @link JobStatusObserver unit tests
131+
*/
130132
@EnableKubernetesMockClient(crud = true)
131133
public class ApplicationReconcilerTest extends OperatorTestBase {
132134

@@ -619,11 +621,11 @@ private void verifyAndSetRunningJobsToStatus(
619621
.setJobStatus(
620622
new JobStatus()
621623
.toBuilder()
622-
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
623-
.jobName(runningJobs.get(0).f1.getJobName())
624-
.updateTime(Long.toString(System.currentTimeMillis()))
625-
.state("RUNNING")
626-
.build());
624+
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
625+
.jobName(runningJobs.get(0).f1.getJobName())
626+
.updateTime(Long.toString(System.currentTimeMillis()))
627+
.state("RUNNING")
628+
.build());
627629
deployment.getStatus().setJobManagerDeploymentStatus(JobManagerDeploymentStatus.READY);
628630
}
629631

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/reconciler/deployment/ApplicationReconcilerUpgradeModeTest.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@
6565
import static org.junit.jupiter.api.Assertions.assertNull;
6666
import static org.junit.jupiter.api.Assertions.fail;
6767

68-
/** @link JobStatusObserver unit tests */
68+
/**
69+
* @link JobStatusObserver unit tests
70+
*/
6971
@EnableKubernetesMockClient(crud = true)
7072
public class ApplicationReconcilerUpgradeModeTest extends OperatorTestBase {
7173

@@ -723,11 +725,11 @@ private void verifyAndSetRunningJobsToStatus(
723725
.setJobStatus(
724726
new JobStatus()
725727
.toBuilder()
726-
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
727-
.jobName(runningJobs.get(0).f1.getJobName())
728-
.startTime(Long.toString(System.currentTimeMillis()))
729-
.state("RUNNING")
730-
.build());
728+
.jobId(runningJobs.get(0).f1.getJobId().toHexString())
729+
.jobName(runningJobs.get(0).f1.getJobName())
730+
.startTime(Long.toString(System.currentTimeMillis()))
731+
.state("RUNNING")
732+
.build());
731733
deployment.getStatus().setJobManagerDeploymentStatus(JobManagerDeploymentStatus.READY);
732734
}
733735
}

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@
130130
import static org.junit.jupiter.api.Assertions.assertTrue;
131131
import static org.junit.jupiter.api.Assertions.fail;
132132

133-
/** @link FlinkService unit tests */
133+
/**
134+
* @link FlinkService unit tests
135+
*/
134136
@EnableKubernetesMockClient(crud = true)
135137
public class AbstractFlinkServiceTest {
136138

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/NativeFlinkServiceTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@
7979
import static org.junit.jupiter.api.Assertions.assertTrue;
8080
import static org.junit.jupiter.api.Assertions.fail;
8181

82-
/** @link FlinkService unit tests */
82+
/**
83+
* @link FlinkService unit tests
84+
*/
8385
@EnableKubernetesMockClient(crud = true)
8486
public class NativeFlinkServiceTest {
8587
KubernetesClient client;

‎flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/StandaloneFlinkServiceTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
import static org.junit.jupiter.api.Assertions.assertFalse;
5151
import static org.junit.jupiter.api.Assertions.assertTrue;
5252

53-
/** @link StandaloneFlinkService unit tests */
53+
/**
54+
* @link StandaloneFlinkService unit tests
55+
*/
5456
@EnableKubernetesMockClient(crud = true)
5557
public class StandaloneFlinkServiceTest {
5658
KubernetesMockServer mockServer;

‎flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/Fabric8FlinkStandaloneKubeClientTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
import static org.apache.flink.kubernetes.operator.kubeclient.utils.TestUtils.TEST_NAMESPACE;
4444
import static org.junit.jupiter.api.Assertions.assertEquals;
4545

46-
/** @link Fabric8FlinkStandaloneKubeClient unit tests */
46+
/**
47+
* @link Fabric8FlinkStandaloneKubeClient unit tests
48+
*/
4749
@EnableKubernetesMockClient(crud = true, https = false)
4850
public class Fabric8FlinkStandaloneKubeClientTest {
4951
KubernetesMockServer mockWebServer;

‎flink-kubernetes-standalone/src/test/java/org/apache/flink/kubernetes/operator/kubeclient/decorators/CmdStandaloneJobManagerDecoratorTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
import static org.hamcrest.Matchers.contains;
3737
import static org.hamcrest.Matchers.containsInAnyOrder;
3838

39-
/** @link CmdStandaloneJobManagerDecorator unit tests */
39+
/**
40+
* @link CmdStandaloneJobManagerDecorator unit tests
41+
*/
4042
public class CmdStandaloneJobManagerDecoratorTest {
4143

4244
private static final String MOCK_ENTRYPATH = "./docker-entrypath";

0 commit comments

Comments
 (0)