Remove the deprecated Fabric8 method createOrReplace from the project

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaBridgeResource.java

@@ -35,7 +35,7 @@ public KafkaBridge get(String namespace, String name) {
     }
     @Override
     public void create(KafkaBridge resource) {
-        kafkaBridgeClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaBridgeClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaBridge resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaClientsResource.java

@@ -26,7 +26,7 @@ public Deployment get(String namespace, String name) {
 
     @Override
     public void create(Deployment resource) {
-        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createOrReplaceDeployment(resource);
+        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createDeployment(resource);
     }
     @Override
     public void delete(Deployment resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaConnectResource.java

@@ -35,7 +35,7 @@ public KafkaConnect get(String namespace, String name) {
     }
     @Override
     public void create(KafkaConnect resource) {
-        kafkaConnectClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaConnectClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaConnect resource)    {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaConnectorResource.java

@@ -31,7 +31,7 @@ public KafkaConnector get(String namespace, String name) {
 
     @Override
     public void create(KafkaConnector resource) {
-        kafkaConnectorClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaConnectorClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaConnector resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaMirrorMaker2Resource.java

@@ -33,7 +33,7 @@ public KafkaMirrorMaker2 get(String namespace, String name) {
     }
     @Override
     public void create(KafkaMirrorMaker2 resource) {
-        kafkaMirrorMaker2Client().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaMirrorMaker2Client().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaMirrorMaker2 resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaMirrorMakerResource.java

@@ -30,7 +30,7 @@ public KafkaMirrorMaker get(String namespace, String name) {
     }
     @Override
     public void create(KafkaMirrorMaker resource) {
-        kafkaMirrorMakerClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaMirrorMakerClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaMirrorMaker resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaRebalanceResource.java

@@ -32,7 +32,7 @@ public KafkaRebalance get(String namespace, String name) {
     }
     @Override
     public void create(KafkaRebalance resource) {
-        kafkaRebalanceClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaRebalanceClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaRebalance resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaResource.java

@@ -51,7 +51,7 @@ public Kafka get(String namespace, String name) {
 
     @Override
     public void create(Kafka resource) {
-        kafkaClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaTopicResource.java

@@ -31,7 +31,7 @@ public KafkaTopic get(String namespace, String name) {
     }
     @Override
     public void create(KafkaTopic resource) {
-        kafkaTopicClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaTopicClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
     @Override
     public void delete(KafkaTopic resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/KafkaUserResource.java

@@ -31,7 +31,7 @@ public KafkaUser get(String namespace, String name) {
     }
     @Override
     public void create(KafkaUser resource) {
-        kafkaUserClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        kafkaUserClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/crd/StrimziPodSetResource.java

@@ -29,7 +29,7 @@ public StrimziPodSet get(String namespace, String name) {
 
     @Override
     public void create(StrimziPodSet resource) {
-        strimziPodSetClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        strimziPodSetClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).create();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/draincleaner/DrainCleanerResource.java

@@ -30,7 +30,7 @@ public Deployment get(String namespace, String name) {
 
     @Override
     public void create(Deployment resource) {
-        ResourceManager.kubeClient().createOrReplaceDeployment(resource);
+        ResourceManager.kubeClient().createDeployment(resource);
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/ClusterOperatorCustomResourceDefinition.java

@@ -22,7 +22,7 @@ public CustomResourceDefinition get(String namespace, String name) {
     }
     @Override
     public void create(CustomResourceDefinition resource) {
-        kubeClient().createOrReplaceCustomResourceDefinition(resource);
+        kubeClient().createCustomResourceDefinition(resource);
     }
     @Override
     public void delete(CustomResourceDefinition resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/ClusterRoleBindingResource.java

@@ -32,7 +32,7 @@ public ClusterRoleBinding get(String namespace, String name) {
     }
     @Override
     public void create(ClusterRoleBinding resource) {
-        kubeClient(KubeClusterResource.getInstance().defaultNamespace()).createOrReplaceClusterRoleBinding(resource);
+        kubeClient(KubeClusterResource.getInstance().defaultNamespace()).createClusterRoleBinding(resource);
     }
     @Override
     public void delete(ClusterRoleBinding resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/ClusterRoleResource.java

@@ -24,7 +24,7 @@ public ClusterRole get(String namespace, String name) {
     @Override
     public void create(ClusterRole resource) {
         // ClusterRole his operation namespace is only 'default'
-        kubeClient(KubeClusterResource.getInstance().defaultNamespace()).createOrReplaceClusterRoles(resource);
+        kubeClient(KubeClusterResource.getInstance().defaultNamespace()).createClusterRoles(resource);
     }
     @Override
     public void delete(ClusterRole resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/ConfigMapResource.java

@@ -22,7 +22,7 @@ public ConfigMap get(String namespace, String name) {
     }
     @Override
     public void create(ConfigMap resource) {
-        kubeClient().createOrReplaceConfigMap(resource);
+        kubeClient().createConfigMap(resource);
     }
     @Override
     public void delete(ConfigMap resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/DeploymentResource.java

@@ -27,7 +27,7 @@ public Deployment get(String namespace, String name) {
     }
     @Override
     public void create(Deployment resource) {
-        ResourceManager.kubeClient().createOrReplaceDeployment(resource);
+        ResourceManager.kubeClient().createDeployment(resource);
     }
     @Override
     public void delete(Deployment resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/LeaseResource.java

@@ -23,7 +23,7 @@ public Lease get(String namespace, String name) {
 
     @Override
     public void create(Lease resource) {
-        kubeClient().getClient().leases().resource(resource).createOrReplace();
+        kubeClient().getClient().leases().resource(resource).serverSideApply();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/RoleBindingResource.java

@@ -28,7 +28,7 @@ public RoleBinding get(String namespace, String name) {
     }
     @Override
     public void create(RoleBinding resource) {
-        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createOrReplaceRoleBinding(resource);
+        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createRoleBinding(resource);
     }
     @Override
     public void delete(RoleBinding resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/RoleResource.java

@@ -28,7 +28,7 @@ public Role get(String namespace, String name) {
     }
     @Override
     public void create(Role resource) {
-        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createOrReplaceRole(resource);
+        ResourceManager.kubeClient().namespace(resource.getMetadata().getNamespace()).createRole(resource);
     }
     @Override
     public void delete(Role resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/kubernetes/ServiceAccountResource.java

@@ -22,7 +22,7 @@ public ServiceAccount get(String namespace, String name) {
     }
     @Override
     public void create(ServiceAccount resource) {
-        kubeClient().createOrReplaceServiceAccount(resource);
+        kubeClient().createServiceAccount(resource);
     }
     @Override
     public void delete(ServiceAccount resource) {

systemtest/src/main/java/io/strimzi/systemtest/resources/openshift/OperatorGroupResource.java

@@ -27,7 +27,7 @@ public OperatorGroup get(String namespace, String name) {
 
     @Override
     public void create(OperatorGroup resource) {
-        operatorGroupClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        operatorGroupClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).serverSideApply();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/openshift/SubscriptionResource.java

@@ -29,7 +29,7 @@ public Subscription get(String namespace, String name) {
 
     @Override
     public void create(Subscription resource) {
-        subscriptionClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).createOrReplace();
+        subscriptionClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).serverSideApply();
     }
 
     @Override

systemtest/src/main/java/io/strimzi/systemtest/resources/operator/BundleResource.java

@@ -49,7 +49,7 @@ public Deployment get(String namespace, String name) {
     }
     @Override
     public void create(Deployment resource) {
-        ResourceManager.kubeClient().createOrReplaceDeployment(resource);
+        ResourceManager.kubeClient().createDeployment(resource);
     }
     @Override
     public void delete(Deployment resource) {

systemtest/src/main/java/io/strimzi/systemtest/templates/crd/KafkaConnectTemplates.java

@@ -16,11 +16,11 @@
 import io.strimzi.systemtest.Constants;
 import io.strimzi.systemtest.Environment;
 import io.strimzi.test.TestUtils;
-import io.strimzi.test.k8s.KubeClusterResource;
 
 import java.util.Random;
 
 import static io.strimzi.operator.common.Util.hashStub;
+import static io.strimzi.test.k8s.KubeClusterResource.kubeClient;
 
 public class KafkaConnectTemplates {
 
@@ -56,7 +56,7 @@ public static KafkaConnectBuilder kafkaConnectWithMetricsAndFileSinkPlugin(Strin
 
     private static void createOrReplaceConnectMetrics(String namespaceName) {
         ConfigMap metricsCm = TestUtils.configMapFromYaml(Constants.PATH_TO_KAFKA_CONNECT_METRICS_CONFIG, "connect-metrics");
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(metricsCm).createOrReplace();
+        kubeClient().createConfigMapInNamespace(namespaceName, metricsCm);
     }
 
     private static KafkaConnectBuilder defaultKafkaConnect(KafkaConnect kafkaConnect, final String namespaceName, String name, String kafkaClusterName, int kafkaConnectReplicas) {

systemtest/src/main/java/io/strimzi/systemtest/templates/crd/KafkaMirrorMaker2Templates.java

@@ -18,7 +18,8 @@
 import io.strimzi.systemtest.resources.ResourceManager;
 import io.strimzi.systemtest.utils.kafkaUtils.KafkaUtils;
 import io.strimzi.test.TestUtils;
-import io.strimzi.test.k8s.KubeClusterResource;
+
+import static io.strimzi.test.k8s.KubeClusterResource.kubeClient;
 
 public class KafkaMirrorMaker2Templates {
 
@@ -32,7 +33,7 @@ public static KafkaMirrorMaker2Builder kafkaMirrorMaker2(String name, String tar
     public static KafkaMirrorMaker2Builder kafkaMirrorMaker2WithMetrics(String namespaceName, String name, String targetClusterName, String sourceClusterName, int kafkaMirrorMaker2Replicas, String sourceNs, String targetNs) {
         KafkaMirrorMaker2 kafkaMirrorMaker2 = getKafkaMirrorMaker2FromYaml(Constants.PATH_TO_KAFKA_MIRROR_MAKER_2_METRICS_CONFIG);
         ConfigMap metricsCm = TestUtils.configMapFromYaml(Constants.PATH_TO_KAFKA_MIRROR_MAKER_2_METRICS_CONFIG, "mirror-maker-2-metrics");
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(metricsCm).createOrReplace();
+        kubeClient().createConfigMapInNamespace(namespaceName, metricsCm);
         return defaultKafkaMirrorMaker2(kafkaMirrorMaker2, name, targetClusterName, sourceClusterName, kafkaMirrorMaker2Replicas, false, sourceNs, targetNs);
     }
 

systemtest/src/main/java/io/strimzi/systemtest/templates/crd/KafkaTemplates.java

@@ -84,7 +84,7 @@ public static KafkaBuilder kafkaWithMetrics(String name, String namespace, int k
         Kafka kafka = getKafkaFromYaml(Constants.PATH_TO_KAFKA_METRICS_CONFIG);
 
         ConfigMap metricsCm = TestUtils.configMapFromYaml(Constants.PATH_TO_KAFKA_METRICS_CONFIG, "kafka-metrics");
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespace).resource(metricsCm).createOrReplace();
+        KubeClusterResource.kubeClient().createConfigMapInNamespace(namespace, metricsCm);
         return defaultKafka(kafka, name, kafkaReplicas, zookeeperReplicas)
             .editOrNewMetadata()
                 .withNamespace(namespace)
@@ -103,9 +103,9 @@ public static KafkaBuilder kafkaWithCruiseControl(String name, int kafkaReplicas
     public static KafkaBuilder kafkaWithMetricsAndCruiseControlWithMetrics(String namespaceName, String name, int kafkaReplicas, int zookeeperReplicas) {
         Kafka kafka = getKafkaFromYaml(Constants.PATH_TO_KAFKA_METRICS_CONFIG);
         ConfigMap kafkaMetricsCm = TestUtils.configMapFromYaml(Constants.PATH_TO_KAFKA_METRICS_CONFIG, "kafka-metrics");
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(kafkaMetricsCm).createOrReplace();
+        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(kafkaMetricsCm).serverSideApply();
         ConfigMap zkMetricsCm = TestUtils.configMapFromYaml(Constants.PATH_TO_KAFKA_METRICS_CONFIG, "kafka-metrics");
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(zkMetricsCm).createOrReplace();
+        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(zkMetricsCm).serverSideApply();
 
         ConfigMap ccCm = new ConfigMapBuilder()
                 .withApiVersion("v1")
@@ -120,7 +120,7 @@ public static KafkaBuilder kafkaWithMetricsAndCruiseControlWithMetrics(String na
                         "  name: kafka_cruisecontrol_$1_$2\n" +
                         "  type: GAUGE"))
                 .build();
-        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(ccCm).createOrReplace();
+        KubeClusterResource.kubeClient().getClient().configMaps().inNamespace(namespaceName).resource(ccCm).serverSideApply();
 
         ConfigMapKeySelector cmks = new ConfigMapKeySelectorBuilder()
                 .withName("cruise-control-metrics-test")

systemtest/src/test/java/io/strimzi/systemtest/connect/ConnectIsolatedST.java

@@ -1200,9 +1200,9 @@ void testMountingSecretAndConfigMapAsVolumesAndEnvVars(ExtensionContext extensio
 
         kubeClient(namespaceName).createSecret(connectSecret);
         kubeClient(namespaceName).createSecret(dotedConnectSecret);
-        
-        kubeClient(namespaceName).getClient().configMaps().inNamespace(namespaceName).resource(configMap).createOrReplace();
-        kubeClient(namespaceName).getClient().configMaps().inNamespace(namespaceName).resource(dotedConfigMap).createOrReplace();
+
+        kubeClient().createConfigMapInNamespace(namespaceName, configMap);
+        kubeClient().createConfigMapInNamespace(namespaceName, dotedConfigMap);
 
         resourceManager.createResource(extensionContext, KafkaTemplates.kafkaEphemeral(clusterName, 3).build());
         resourceManager.createResource(extensionContext, KafkaConnectTemplates.kafkaConnect(clusterName, namespaceName, 1)

systemtest/src/test/java/io/strimzi/systemtest/kafka/ConfigProviderST.java

@@ -134,7 +134,7 @@ void testConnectWithConnectorUsingConfigAndEnvProvider(ExtensionContext extensio
             .endRule()
             .build();
 
-        kubeClient().getClient().resource(configRole).createOrReplace();
+        kubeClient().createRole(configRole);
 
         String configPrefix = "configmaps:" + namespaceName + "/connector-config:";