From 8edeee0b0f0f624c2a7dc67721d88a428890a3f5 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 1 Sep 2023 15:38:40 +0300 Subject: [PATCH] replace fabric8 serialization calls (4) (#1423) * fix * placeholder commit --- .../catalog/watch/Fabric8CatalogWatchIT.java | 9 +++++---- .../Fabric8CatalogWatchWithNamespacesIT.java | 9 +++++---- .../event/reload/ConfigMapEventReloadIT.java | 13 +++++++------ .../reload/DataChangesInConfigMapReloadIT.java | 9 +++++---- ...rapEnabledPollingReloadConfigMapMountIT.java | 11 ++++++----- .../reload/ConfigMapPollingReloadIT.java | 9 +++++---- .../reload/PollingReloadConfigMapMountIT.java | 11 ++++++----- .../fabric8/configmap/Fabric8ConfigMapIT.java | 9 +++++---- .../bootstrap/Fabric8DiscoveryBootstrapIT.java | 7 ++++--- .../Fabric8DiscoveryPodMetadataIT.java | 17 +++++++++-------- .../it/Fabric8ClientLoadbalancerIT.java | 7 ++++--- .../reload/DataChangesInSecretsReloadIT.java | 9 +++++---- .../event/reload/SecretsEventsReloadIT.java | 9 +++++---- .../kubernetes/fabric8/core/SimpleCoreIT.java | 7 ++++--- .../fabric8/istio/Fabric8IstioIT.java | 7 ++++--- 15 files changed, 79 insertions(+), 64 deletions(-) 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/Fabric8CatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java index 2b7776d8..8bd14f54 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchIT.java @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -202,10 +203,10 @@ class Fabric8CatalogWatchIT { InputStream ingressStream = util.inputStream("app/watcher-ingress.yaml"); Deployment deployment = useEndpointSlices - ? client.apps().deployments().load(endpointSlicesDeploymentStream).get() - : client.apps().deployments().load(endpointsDeploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + ? Serialization.unmarshal(endpointSlicesDeploymentStream, Deployment.class) + : Serialization.unmarshal(endpointsDeploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(Fabric8CatalogWatchIT.NAMESPACE, null, deployment, service, ingress, true); 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/Fabric8CatalogWatchWithNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java index e2250a00..bf998331 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithNamespacesIT.java @@ -29,6 +29,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -219,8 +220,8 @@ class Fabric8CatalogWatchWithNamespacesIT { InputStream ingressStream = util.inputStream("app/watcher-ingress.yaml"); Deployment deployment = useEndpointSlices - ? client.apps().deployments().load(endpointSlicesDeploymentStream).get() - : client.apps().deployments().load(endpointsDeploymentStream).get(); + ? Serialization.unmarshal(endpointSlicesDeploymentStream, Deployment.class) + : Serialization.unmarshal(endpointsDeploymentStream, Deployment.class); List envVars = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -233,8 +234,8 @@ class Fabric8CatalogWatchWithNamespacesIT { deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(Fabric8CatalogWatchWithNamespacesIT.NAMESPACE_DEFAULT, null, deployment, service, diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java index 59b2f624..5029dbf8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/ConfigMapEventReloadIT.java @@ -35,6 +35,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -295,7 +296,7 @@ class ConfigMapEventReloadIT { InputStream rightConfigMapStream = util.inputStream("right-configmap.yaml"); InputStream rightWithLabelConfigMapStream = util.inputStream("right-configmap-with-label.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List envVars = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -312,11 +313,11 @@ class ConfigMapEventReloadIT { deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap leftConfigMap = client.configMaps().load(leftConfigMapStream).get(); - ConfigMap rightConfigMap = client.configMaps().load(rightConfigMapStream).get(); - ConfigMap rightWithLabelConfigMap = client.configMaps().load(rightWithLabelConfigMapStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap leftConfigMap = Serialization.unmarshal(leftConfigMapStream, ConfigMap.class); + ConfigMap rightConfigMap = Serialization.unmarshal(rightConfigMapStream, ConfigMap.class); + ConfigMap rightWithLabelConfigMap = Serialization.unmarshal(rightWithLabelConfigMapStream, ConfigMap.class); if (phase.equals(Phase.CREATE)) { util.createAndWait("left", leftConfigMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java index 7af428c9..032e32d0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java @@ -33,6 +33,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -154,7 +155,7 @@ class DataChangesInConfigMapReloadIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream configmapAsStream = util.inputStream("left-configmap.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List envVars = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -172,9 +173,9 @@ class DataChangesInConfigMapReloadIT { envVars.add(secretsDisabledEnvVar); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap configMap = client.configMaps().load(configmapAsStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap configMap = Serialization.unmarshal(configmapAsStream, ConfigMap.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(LEFT_NAMESPACE, configMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java index c5f3d1eb..245ffaf4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java @@ -30,6 +30,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -111,7 +112,7 @@ public class BootstrapEnabledPollingReloadConfigMapMountIT { // replace data in configmap and wait for k8s to pick it up // our polling will detect that and restart the app InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml"); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); configMap.setData(Map.of("application.properties", "from.properties.key=as-mount-changed")); client.configMaps().inNamespace("default").resource(configMap).createOrReplace(); @@ -127,10 +128,10 @@ public class BootstrapEnabledPollingReloadConfigMapMountIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); List existing = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java index 0c14ac12..699e2058 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/ConfigMapPollingReloadIT.java @@ -32,6 +32,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -112,10 +113,10 @@ class ConfigMapPollingReloadIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream configMapStream = util.inputStream("configmap.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); List existing = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java index 5675b06c..0ab3bebc 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/configmap/polling/reload/PollingReloadConfigMapMountIT.java @@ -30,6 +30,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -115,7 +116,7 @@ class PollingReloadConfigMapMountIT { // replace data in configmap and wait for k8s to pick it up // our polling will detect that and restart the app InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml"); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); configMap.setData(Map.of("application.properties", "from.properties.key=as-mount-changed")); client.configMaps().inNamespace("default").resource(configMap).createOrReplace(); @@ -131,10 +132,10 @@ class PollingReloadConfigMapMountIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream configMapStream = util.inputStream("mount/configmap-mount.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); List existing = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); 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 0d3c4cd3..701d3b26 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 @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -90,10 +91,10 @@ class Fabric8ConfigMapIT { InputStream ingressStream = util.inputStream("fabric8-ingress.yaml"); InputStream configMapStream = util.inputStream("fabric8-configmap.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - ConfigMap configMap = client.configMaps().load(configMapStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ConfigMap configMap = Serialization.unmarshal(configMapStream, ConfigMap.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, configMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java index a06f6fd6..9b7ba3d1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java @@ -28,6 +28,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -107,7 +108,7 @@ class Fabric8DiscoveryBootstrapIT { InputStream serviceStream = util.inputStream("fabric8-discovery-service.yaml"); InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List existing = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -118,8 +119,8 @@ class Fabric8DiscoveryBootstrapIT { .withValue("DEBUG").build()); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java index 6f7c463d..758cb213 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java @@ -28,7 +28,9 @@ import io.fabric8.kubernetes.api.model.EnvVarBuilder; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; +import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -228,7 +230,7 @@ class Fabric8DiscoveryPodMetadataIT { InputStream discoveryServiceStream = util.inputStream("fabric8-discovery-service.yaml"); InputStream ingressStream = util.inputStream("fabric8-discovery-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List existing = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -241,19 +243,18 @@ class Fabric8DiscoveryPodMetadataIT { .withValue("DEBUG").build()); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(existing); - Service externalServiceName = client.services().load(externalNameServiceStream).get(); - Service discoveryService = client.services().load(discoveryServiceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Service externalServiceName = Serialization.unmarshal(externalNameServiceStream, Service.class); + Service discoveryService = Serialization.unmarshal(discoveryServiceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + ClusterRoleBinding clusterRoleBinding = Serialization.unmarshal(getAdminRole(), ClusterRoleBinding.class); if (phase.equals(Phase.CREATE)) { - client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get()) - .create(); + client.rbac().clusterRoleBindings().resource(clusterRoleBinding).create(); util.createAndWait(NAMESPACE, IMAGE_NAME, deployment, discoveryService, ingress, true); util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true); } else { - client.rbac().clusterRoleBindings().resource(client.rbac().clusterRoleBindings().load(getAdminRole()).get()) - .delete(); + client.rbac().clusterRoleBindings().resource(clusterRoleBinding).delete(); util.deleteAndWait(NAMESPACE, deployment, discoveryService, ingress); util.deleteAndWait(NAMESPACE, null, externalServiceName, null); } 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 006e9654..b3fa1ec3 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 @@ -29,6 +29,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; @@ -134,7 +135,7 @@ public class Fabric8ClientLoadbalancerIT { InputStream ingressStream = util .inputStream("spring-cloud-kubernetes-fabric8-client-loadbalancer-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List envVars = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); EnvVar activeProfileProperty = new EnvVarBuilder().withName("SPRING_CLOUD_KUBERNETES_LOADBALANCER_MODE") @@ -142,8 +143,8 @@ public class Fabric8ClientLoadbalancerIT { envVars.add(activeProfileProperty); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); 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/DataChangesInSecretsReloadIT.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/DataChangesInSecretsReloadIT.java index ec042240..25a68172 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/DataChangesInSecretsReloadIT.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/DataChangesInSecretsReloadIT.java @@ -33,6 +33,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -151,7 +152,7 @@ class DataChangesInSecretsReloadIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream secretAsStream = util.inputStream("secret.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); List envVars = new ArrayList<>( deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv()); @@ -169,9 +170,9 @@ class DataChangesInSecretsReloadIT { envVars.add(configMapsDisabledEnvVar); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - Secret secret = client.secrets().load(secretAsStream).get(); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + Secret secret = Serialization.unmarshal(secretAsStream, Secret.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, secret); 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 ad845840..97bb53ec 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 @@ -33,6 +33,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -147,10 +148,10 @@ class SecretsEventsReloadIT { InputStream ingressStream = util.inputStream("ingress.yaml"); InputStream secretStream = util.inputStream("secret.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); - Secret secret = client.secrets().load(secretStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); + Secret secret = Serialization.unmarshal(secretStream, Secret.class); if (configMapsDisabled) { List envVars = new ArrayList<>( 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 2cfc1c5d..434485f4 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 @@ -24,6 +24,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -92,9 +93,9 @@ class SimpleCoreIT { InputStream serviceStream = util.inputStream("simple-core-service.yaml"); InputStream ingressStream = util.inputStream("simple-core-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); 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 247ec912..455aa93e 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 @@ -25,6 +25,7 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.utils.Serialization; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -117,9 +118,9 @@ class Fabric8IstioIT { InputStream serviceStream = util.inputStream("istio-service.yaml"); InputStream ingressStream = util.inputStream("istio-ingress.yaml"); - Deployment deployment = client.apps().deployments().load(deploymentStream).get(); - Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class); + Service service = Serialization.unmarshal(serviceStream, Service.class); + Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);