diff --git a/.gitignore b/.gitignore
index 2db0ebc15f..0fd15a8f2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@ buildNumber.properties
 *.DS_Store
 
 .kube
+
+# VSCode settings
+.vscode/
\ No newline at end of file
diff --git a/examples/kubernetes-client-examples/src/main/java/org/apache/flink/examples/Basic.java b/examples/kubernetes-client-examples/src/main/java/org/apache/flink/examples/Basic.java
index f4fb0ae1ca..17a7358693 100644
--- a/examples/kubernetes-client-examples/src/main/java/org/apache/flink/examples/Basic.java
+++ b/examples/kubernetes-client-examples/src/main/java/org/apache/flink/examples/Basic.java
@@ -29,6 +29,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
 
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public static void main(String[] args) {
                                 .build());
 
         try (KubernetesClient kubernetesClient = new KubernetesClientBuilder().build()) {
-            kubernetesClient.resource(flinkDeployment).createOrReplace();
+            kubernetesClient.resource(flinkDeployment).createOr(NonDeletingOperation::update);
         }
     }
 }
diff --git a/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkDeployment.java b/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkDeployment.java
index a09774af9e..b10f3cb673 100644
--- a/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkDeployment.java
+++ b/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkDeployment.java
@@ -24,7 +24,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.ShortNames;
 import io.fabric8.kubernetes.model.annotation.Version;
@@ -37,8 +36,7 @@
 @Version(CrdConstants.API_VERSION)
 @ShortNames({"flinkdep"})
 public class FlinkDeployment
-        extends AbstractFlinkResource<FlinkDeploymentSpec, FlinkDeploymentStatus>
-        implements Namespaced {
+        extends AbstractFlinkResource<FlinkDeploymentSpec, FlinkDeploymentStatus> {
 
     @VisibleForTesting
     @Override
diff --git a/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkSessionJob.java b/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkSessionJob.java
index ec9eed6944..6c152c0560 100644
--- a/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkSessionJob.java
+++ b/flink-kubernetes-operator-api/src/main/java/org/apache/flink/kubernetes/operator/api/FlinkSessionJob.java
@@ -23,7 +23,6 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.ShortNames;
 import io.fabric8.kubernetes.model.annotation.Version;
@@ -36,8 +35,7 @@
 @Version(CrdConstants.API_VERSION)
 @ShortNames({"sessionjob"})
 public class FlinkSessionJob
-        extends AbstractFlinkResource<FlinkSessionJobSpec, FlinkSessionJobStatus>
-        implements Namespaced {
+        extends AbstractFlinkResource<FlinkSessionJobSpec, FlinkSessionJobStatus> {
 
     @Override
     protected FlinkSessionJobStatus initStatus() {