Skip to content

Commit 2e58279

Browse files
authored
[hotfix] Fix redundant implementation of interfaces and clean deprecated fabric8 methods
1 parent 7d83213 commit 2e58279

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ buildNumber.properties
3838
*.DS_Store
3939

4040
.kube
41+
42+
# VSCode settings
43+
.vscode/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import io.fabric8.kubernetes.api.model.ObjectMeta;
3030
import io.fabric8.kubernetes.client.KubernetesClient;
3131
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
32+
import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
3233

3334
import java.util.Map;
3435

@@ -68,7 +69,7 @@ public static void main(String[] args) {
6869
.build());
6970

7071
try (KubernetesClient kubernetesClient = new KubernetesClientBuilder().build()) {
71-
kubernetesClient.resource(flinkDeployment).createOrReplace();
72+
kubernetesClient.resource(flinkDeployment).createOr(NonDeletingOperation::update);
7273
}
7374
}
7475
}

flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkDeployment.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import com.fasterxml.jackson.annotation.JsonInclude;
2626
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
27-
import io.fabric8.kubernetes.api.model.Namespaced;
2827
import io.fabric8.kubernetes.model.annotation.Group;
2928
import io.fabric8.kubernetes.model.annotation.ShortNames;
3029
import io.fabric8.kubernetes.model.annotation.Version;
@@ -37,8 +36,7 @@
3736
@Version(CrdConstants.API_VERSION)
3837
@ShortNames({"flinkdep"})
3938
public class FlinkDeployment
40-
extends AbstractFlinkResource<FlinkDeploymentSpec, FlinkDeploymentStatus>
41-
implements Namespaced {
39+
extends AbstractFlinkResource<FlinkDeploymentSpec, FlinkDeploymentStatus> {
4240

4341
@VisibleForTesting
4442
@Override

flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkSessionJob.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import com.fasterxml.jackson.annotation.JsonInclude;
2525
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
26-
import io.fabric8.kubernetes.api.model.Namespaced;
2726
import io.fabric8.kubernetes.model.annotation.Group;
2827
import io.fabric8.kubernetes.model.annotation.ShortNames;
2928
import io.fabric8.kubernetes.model.annotation.Version;
@@ -36,8 +35,7 @@
3635
@Version(CrdConstants.API_VERSION)
3736
@ShortNames({"sessionjob"})
3837
public class FlinkSessionJob
39-
extends AbstractFlinkResource<FlinkSessionJobSpec, FlinkSessionJobStatus>
40-
implements Namespaced {
38+
extends AbstractFlinkResource<FlinkSessionJobSpec, FlinkSessionJobStatus> {
4139

4240
@Override
4341
protected FlinkSessionJobStatus initStatus() {

0 commit comments

Comments
 (0)