Skip to content

Commit 3829654

Browse files
csviricsviri
committed
naming
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 381951b commit 3829654

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

‎examples/kubernetes-client-examples/src/main/java/org/apache/flink/examples/Basic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void main(String[] args) {
4949
flinkDeploymentSpec.setImage("flink:1.19");
5050
Map<String, String> flinkConfiguration =
5151
Map.ofEntries(entry("taskmanager.numberOfTaskSlots", "2"));
52-
flinkDeploymentSpec.setConfiguration(flinkConfiguration);
52+
flinkDeploymentSpec.setFlinkConfiguration(flinkConfiguration);
5353
flinkDeployment.setSpec(flinkDeploymentSpec);
5454
flinkDeploymentSpec.setServiceAccount("flink");
5555
JobManagerSpec jobManagerSpec = new JobManagerSpec();

‎flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/spec/AbstractFlinkSpec.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ public abstract class AbstractFlinkSpec implements Diffable<AbstractFlinkSpec> {
6666

6767
@Tolerate
6868
@JsonIgnore
69-
public void setConfiguration(Map<String, String> config) {
69+
public void setFlinkConfiguration(Map<String, String> config) {
7070
flinkConfiguration.setAllFrom(config);
7171
}
7272

7373
@Tolerate
7474
@JsonIgnore
75-
public void setConfiguration(Configuration config) {
76-
setConfiguration(config.toMap());
75+
public void setFlinkConfiguration(Configuration config) {
76+
setFlinkConfiguration(config.toMap());
7777
}
7878
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,14 @@ protected void updateVertexResources(
280280
var appConfig = spec.getFlinkConfiguration().asConfiguration();
281281
appConfig.set(JobManagerOptions.SCHEDULER, JobManagerOptions.SchedulerType.Adaptive);
282282

283-
spec.setConfiguration(appConfig);
283+
spec.setFlinkConfiguration(appConfig);
284284
var reconStatus = flinkDep.getStatus().getReconciliationStatus();
285285
reconStatus.serializeAndSetLastReconciledSpec(spec, flinkDep);
286286

287287
appConfig.set(
288288
PipelineOptions.PARALLELISM_OVERRIDES,
289289
Map.of(v1.toHexString(), "4", v2.toHexString(), "1"));
290-
spec.setConfiguration(appConfig);
290+
spec.setFlinkConfiguration(appConfig);
291291

292292
flinkDep.getStatus().getJobStatus().setState(JobStatus.RUNNING);
293293

@@ -321,7 +321,7 @@ protected void updateVertexResources(
321321

322322
// Baseline
323323
appConfig.set(PipelineOptions.PARALLELISM_OVERRIDES, Map.of(v1.toHexString(), "4"));
324-
spec.setConfiguration(appConfig);
324+
spec.setFlinkConfiguration(appConfig);
325325
testScaleConditionDep(flinkDep, service, d -> {}, true);
326326
testScaleConditionLastSpec(flinkDep, service, d -> {}, true);
327327

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void testValidationWithoutDefaultConfig() {
163163
testError(
164164
dep ->
165165
dep.getSpec()
166-
.setConfiguration(
166+
.setFlinkConfiguration(
167167
Map.of(
168168
KubernetesOperatorConfigOptions
169169
.PERIODIC_SAVEPOINT_INTERVAL
@@ -176,7 +176,7 @@ public void testValidationWithoutDefaultConfig() {
176176
testError(
177177
dep ->
178178
dep.getSpec()
179-
.setConfiguration(
179+
.setFlinkConfiguration(
180180
Map.of(
181181
KubernetesOperatorConfigOptions
182182
.OPERATOR_JOB_UPGRADE_LAST_STATE_CHECKPOINT_MAX_AGE
@@ -190,11 +190,12 @@ public void testValidationWithoutDefaultConfig() {
190190
testSuccess(
191191
dep ->
192192
dep.getSpec()
193-
.setConfiguration(Collections.singletonMap("random", "config")));
193+
.setFlinkConfiguration(
194+
Collections.singletonMap("random", "config")));
194195
testError(
195196
dep ->
196197
dep.getSpec()
197-
.setConfiguration(
198+
.setFlinkConfiguration(
198199
Collections.singletonMap(
199200
KubernetesConfigOptions.NAMESPACE.key(), "myns")),
200201
"Forbidden Flink config key");
@@ -212,7 +213,7 @@ public void testValidationWithoutDefaultConfig() {
212213
testError(
213214
dep ->
214215
dep.getSpec()
215-
.setConfiguration(
216+
.setFlinkConfiguration(
216217
Map.of(
217218
KubernetesOperatorConfigOptions
218219
.OPERATOR_CLUSTER_HEALTH_CHECK_ENABLED
@@ -260,15 +261,15 @@ public void testValidationWithoutDefaultConfig() {
260261

261262
testError(
262263
dep -> {
263-
dep.getSpec().setConfiguration(new HashMap<>());
264+
dep.getSpec().setFlinkConfiguration(new HashMap<>());
264265
dep.getSpec().getJobManager().setReplicas(2);
265266
},
266267
"High availability should be enabled when starting standby JobManagers.");
267268

268269
testError(
269270
dep ->
270271
dep.getSpec()
271-
.setConfiguration(
272+
.setFlinkConfiguration(
272273
Map.of(
273274
KubernetesOperatorConfigOptions
274275
.DEPLOYMENT_ROLLBACK_ENABLED
@@ -303,25 +304,25 @@ public void testValidationWithoutDefaultConfig() {
303304
testError(
304305
dep -> {
305306
dep.getSpec().getTaskManager().getResource().setMemory(null);
306-
dep.getSpec().setConfiguration(Map.of(TASK_HEAP_MEMORY.key(), "1024m"));
307+
dep.getSpec().setFlinkConfiguration(Map.of(TASK_HEAP_MEMORY.key(), "1024m"));
307308
},
308309
"TaskManager resource memory must be defined using `spec.taskManager.resource.memory`");
309310

310311
testSuccess(
311312
dep -> {
312313
dep.getSpec().getJobManager().getResource().setMemory(null);
313-
dep.getSpec().setConfiguration(Map.of(JVM_HEAP_MEMORY.key(), "2048m"));
314+
dep.getSpec().setFlinkConfiguration(Map.of(JVM_HEAP_MEMORY.key(), "2048m"));
314315
});
315316
testSuccess(
316317
dep -> {
317318
dep.getSpec().getTaskManager().getResource().setMemory(null);
318-
dep.getSpec().setConfiguration(Map.of(TOTAL_FLINK_MEMORY.key(), "2048m"));
319+
dep.getSpec().setFlinkConfiguration(Map.of(TOTAL_FLINK_MEMORY.key(), "2048m"));
319320
});
320321
testSuccess(
321322
dep -> {
322323
dep.getSpec().getTaskManager().getResource().setMemory(null);
323324
dep.getSpec()
324-
.setConfiguration(
325+
.setFlinkConfiguration(
325326
Map.of(
326327
TASK_HEAP_MEMORY.key(),
327328
"1024m",
@@ -508,7 +509,7 @@ public void testValidationWithDefaultConfig() {
508509
new DefaultValidator(new FlinkConfigManager(defaultFlinkConf));
509510
testSuccess(
510511
dep -> {
511-
dep.getSpec().setConfiguration(new HashMap<>());
512+
dep.getSpec().setFlinkConfiguration(new HashMap<>());
512513
dep.getSpec().getJob().setUpgradeMode(UpgradeMode.LAST_STATE);
513514
},
514515
validatorWithDefaultConfig);
@@ -694,7 +695,7 @@ public void testSessionJobWithSession() {
694695
sessionJob ->
695696
sessionJob
696697
.getSpec()
697-
.setConfiguration(
698+
.setFlinkConfiguration(
698699
Map.of(
699700
KubernetesOperatorConfigOptions
700701
.JAR_ARTIFACT_HTTP_HEADER
@@ -707,7 +708,7 @@ public void testSessionJobWithSession() {
707708
sessionJob ->
708709
sessionJob
709710
.getSpec()
710-
.setConfiguration(
711+
.setFlinkConfiguration(
711712
Map.of(
712713
KubernetesOperatorConfigOptions
713714
.PERIODIC_SAVEPOINT_INTERVAL
@@ -741,7 +742,7 @@ public void testSessionJobWithSession() {
741742
"test-checkpoint-dir"));
742743
},
743744
flinkDeployment -> {
744-
flinkDeployment.getSpec().setConfiguration(Map.of());
745+
flinkDeployment.getSpec().setFlinkConfiguration(Map.of());
745746
},
746747
null);
747748
}
@@ -1094,7 +1095,7 @@ private Optional<String> testSessionJobAutoScalerConfiguration(
10941095
var sessionJob = TestUtils.buildSessionJob();
10951096
var flinkConfiguration = getDefaultTestAutoScalerFlinkConfigurationMap();
10961097
flinkConfigurationModifier.accept(flinkConfiguration);
1097-
sessionCluster.getSpec().setConfiguration(flinkConfiguration);
1098+
sessionCluster.getSpec().setFlinkConfiguration(flinkConfiguration);
10981099
return validator.validateSessionJob(sessionJob, Optional.of(sessionCluster));
10991100
}
11001101

@@ -1103,7 +1104,7 @@ public Optional<String> testAutoScalerConfiguration(
11031104
FlinkDeployment deployment = TestUtils.buildApplicationCluster();
11041105
var flinkConfiguration = getDefaultTestAutoScalerFlinkConfigurationMap();
11051106
flinkConfigurationModifier.accept(flinkConfiguration);
1106-
deployment.getSpec().setConfiguration(flinkConfiguration);
1107+
deployment.getSpec().setFlinkConfiguration(flinkConfiguration);
11071108
return validator.validateDeployment(deployment);
11081109
}
11091110

0 commit comments

Comments
 (0)