diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java index 761adba0..7e9c2daa 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java @@ -210,12 +210,12 @@ class CatalogWatchIT { Commons.pullImage(image[0], image[1], K3S); Commons.loadImage(image[0], image[1], "busybox", K3S); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); busyboxDeploymentName = deployment.getMetadata().getName(); Service busyboxService = client.services().load(getBusyboxService()).get(); busyboxServiceName = busyboxService.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(busyboxService); + client.services().inNamespace(NAMESPACE).resource(busyboxService).create(); Fabric8Utils.waitForDeployment(client, busyboxDeploymentName, NAMESPACE, 2, 600); @@ -230,18 +230,18 @@ class CatalogWatchIT { String currentImage = appDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); appDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(appDeployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(appDeployment).create(); appDeploymentName = appDeployment.getMetadata().getName(); Service appService = client.services().load(getAppService()).get(); appServiceName = appService.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(appService); + client.services().inNamespace(NAMESPACE).resource(appService).create(); Fabric8Utils.waitForDeployment(client, appDeploymentName, NAMESPACE, 2, 600); Ingress appIngress = client.network().v1().ingresses().load(getAppIngress()).get(); appIngressName = appIngress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(appIngress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(appIngress).create(); Fabric8Utils.waitForIngress(client, appIngressName, NAMESPACE); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java index 2ee47ba3..d43e0300 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8ConfigMapIT.java @@ -110,7 +110,7 @@ class Fabric8ConfigMapIT { ConfigMap configMap = client.configMaps().load(getConfigMap()).get(); configMapName = configMap.getMetadata().getName(); - client.configMaps().create(configMap); + client.configMaps().resource(configMap).create(); Deployment deployment = client.apps().deployments().load(getDeployment()).get(); @@ -118,16 +118,16 @@ class Fabric8ConfigMapIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-configmap-deployment", NAMESPACE, 2, 600); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java index fca1f5bf..f01902ff 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryIT.java @@ -131,16 +131,16 @@ class Fabric8DiscoveryIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-discovery-deployment", NAMESPACE, 2, 600); @@ -160,13 +160,13 @@ class Fabric8DiscoveryIT { String[] image = K8SUtils.getImageFromDeployment(deployment).split(":"); Commons.pullImage(image[0], image[1], K3S); Commons.loadImage(image[0], image[1], "wiremock", K3S); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); mockDeploymentName = deployment.getMetadata().getName(); mockDeploymentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); Service service = client.services().load(getMockService()).get(); mockServiceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Fabric8Utils.waitForDeployment(client, "wiremock-deployment", NAMESPACE, 2, 600); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java index f49ef8ed..0005ee82 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/Fabric8DiscoveryNamespaceFilterIT.java @@ -159,18 +159,18 @@ class Fabric8DiscoveryNamespaceFilterIT { deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(env); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); - client.rbac().clusterRoleBindings().create(client.rbac().clusterRoleBindings().load(getAdminRole()).get()); + client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get()).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-discovery-deployment", NAMESPACE, 2, 600); @@ -201,19 +201,19 @@ class Fabric8DiscoveryNamespaceFilterIT { meta.setName(namespace); meta.setNamespace(namespace); namespaceDef.setMetadata(meta); - client.namespaces().create(namespaceDef); + client.namespaces().resource(namespaceDef).create(); Deployment deployment = client.apps().deployments().load(getMockDeployment()).get(); String[] image = K8SUtils.getImageFromDeployment(deployment).split(":"); Commons.pullImage(image[0], image[1], K3S); Commons.loadImage(image[0], image[1], "wiremock", K3S); - client.apps().deployments().inNamespace(namespace).create(deployment); + client.apps().deployments().inNamespace(namespace).resource(deployment).create(); mockDeploymentName = deployment.getMetadata().getName(); mockDeploymentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); Service service = client.services().load(getMockService()).get(); mockServiceName = service.getMetadata().getName(); - client.services().inNamespace(namespace).create(service); + client.services().inNamespace(namespace).resource(service).create(); Fabric8Utils.waitForDeployment(client, "wiremock-deployment", namespace, 2, 600); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java index adaa1248..0a5c4f54 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java @@ -158,16 +158,16 @@ public class Fabric8ClientLoadbalancerIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-loadbalancer-deployment", NAMESPACE, 2, 600); @@ -189,16 +189,16 @@ public class Fabric8ClientLoadbalancerIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-loadbalancer-deployment", NAMESPACE, 2, 600); @@ -218,12 +218,12 @@ public class Fabric8ClientLoadbalancerIT { String[] image = K8SUtils.getImageFromDeployment(deployment).split(":"); Commons.pullImage(image[0], image[1], K3S); Commons.loadImage(image[0], image[1], "wiremock", K3S); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); mockDeploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getMockService()).get(); mockServiceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getMockIngress()).get(); mockIngressName = ingress.getMetadata().getName(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java index 76ba8962..4dc98054 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/secrets/event/reload/SecretsEventsReloadIT.java @@ -138,7 +138,7 @@ class SecretsEventsReloadIT { Secret configMap = client.secrets().load(getSecret()).get(); secretName = configMap.getMetadata().getName(); - client.secrets().create(configMap); + client.secrets().resource(configMap).create(); Deployment deployment = client.apps().deployments().load(getDeployment()).get(); @@ -146,16 +146,16 @@ class SecretsEventsReloadIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-secrets-deployment-event-reload", NAMESPACE, 2, 600); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java index 5c49e556..ad698992 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/java/org/springframework/cloud/kubernetes/fabric8/core/SimpleCoreIT.java @@ -116,16 +116,16 @@ class SimpleCoreIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-client-simple-core-deployment", NAMESPACE, 2, 600); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java index a7c05e8c..83364f33 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/java/org/springframework/cloud/kubernetes/fabric8/istio/Fabric8IstioIT.java @@ -158,16 +158,16 @@ class Fabric8IstioIT { String currentImage = deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getImage(); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(currentImage + ":" + version); - client.apps().deployments().inNamespace(NAMESPACE).create(deployment); + client.apps().deployments().inNamespace(NAMESPACE).resource(deployment).create(); deploymentName = deployment.getMetadata().getName(); Service service = client.services().load(getService()).get(); serviceName = service.getMetadata().getName(); - client.services().inNamespace(NAMESPACE).create(service); + client.services().inNamespace(NAMESPACE).resource(service).create(); Ingress ingress = client.network().v1().ingresses().load(getIngress()).get(); ingressName = ingress.getMetadata().getName(); - client.network().v1().ingresses().inNamespace(NAMESPACE).create(ingress); + client.network().v1().ingresses().inNamespace(NAMESPACE).resource(ingress).create(); Fabric8Utils.waitForIngress(client, ingressName, NAMESPACE); Fabric8Utils.waitForDeployment(client, "spring-cloud-kubernetes-fabric8-istio-it-deployment", NAMESPACE, 2, diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/resources/logback-test.xml index 9e284876..ee243343 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/resources/logback-test.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/src/test/resources/logback-test.xml @@ -11,4 +11,5 @@ +