diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java index 7fec5fdb8a..ece45dfcc1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java @@ -279,8 +279,8 @@ private static void manifests(Phase phase) { ClusterRoleBinding clusterRoleBinding = Serialization.unmarshal(getAdminRole(), ClusterRoleBinding.class); if (phase.equals(Phase.CREATE)) { client.rbac().clusterRoleBindings().resource(clusterRoleBinding).create(); - util.createAndWait(NAMESPACE, IMAGE_NAME, deployment, discoveryService, ingress, true); - util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true); + util.createAndWait(NAMESPACE, deployment, discoveryService, ingress, true); + util.createAndWait(NAMESPACE, null, externalServiceName, null, true); } else { client.rbac().clusterRoleBindings().resource(clusterRoleBinding).delete(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java index 7e6cdf18ff..662c407218 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java @@ -128,7 +128,7 @@ private static void appManifests(Phase phase) { Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else { util.deleteAndWait(NAMESPACE, deployment, service, ingress); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java index 780ad9b644..0021568192 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java @@ -386,7 +386,7 @@ private static void manifests(Phase phase) { util.createAndWait("right", rightConfigMap, null); util.createAndWait("right", rightWithLabelConfigMap, null); util.createAndWait(NAMESPACE, configMap, secret); - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else { util.deleteAndWait("left", leftConfigMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java index 26f1ba3eed..7b2f27198f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java @@ -224,7 +224,7 @@ private static void app(Phase phase) { V1Ingress ingress = (V1Ingress) util.yaml("app/watcher-ingress.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, ingress); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 9e1119af98..c01469a0b2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -172,7 +172,7 @@ private static void configWatcher(Phase phase) { if (phase.equals(Phase.CREATE)) { util.createAndWait(NAMESPACE, configMap, null); - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else { util.deleteAndWait(NAMESPACE, configMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java index 22c8d0976b..18257fb690 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java @@ -216,7 +216,7 @@ private static void configWatcher(Phase phase) { if (phase.equals(Phase.CREATE)) { util.createAndWait(DEFAULT_NAMESPACE, configMap, null); - util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, null, true); + util.createAndWait(DEFAULT_NAMESPACE, deployment, service, null, true); } else { util.deleteAndWait(DEFAULT_NAMESPACE, configMap, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java index 92806f1c6d..63c594b004 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java @@ -286,7 +286,7 @@ private static void discoveryClient(Phase phase) { V1Ingress ingress = (V1Ingress) util.yaml("ingress.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else { util.deleteAndWait(NAMESPACE, deployment, service, ingress); @@ -299,7 +299,7 @@ private static void discoveryServer(Phase phase) { V1Service service = (V1Service) util.yaml("server/spring-cloud-kubernetes-discoveryserver-service.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else { util.deleteAndWait(NAMESPACE, deployment, service, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java index 9d64b02ac2..94c661ff3f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java @@ -488,8 +488,8 @@ private static void manifests(Phase phase) { envVars.add(commonsLevel); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); - util.createAndWait(NAMESPACE, null, null, externalNameService, null, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, null, externalNameService, null, true); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java index c4e957b005..1ded39a253 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -271,7 +271,7 @@ private static void manifests(Phase phase) { envVars.add(debugLevel); envVars.add(selectiveNamespaceA); deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars); - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java index 0fdce32580..6383def957 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java @@ -163,7 +163,7 @@ private void appA(Phase phase) { .yaml("ingress/spring-cloud-kubernetes-configuration-watcher-multiple-apps-ingress.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, ingress); @@ -175,7 +175,7 @@ private void appB(Phase phase) { V1Service service = (V1Service) util.yaml("app-b/app-b-service.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, null); @@ -189,7 +189,7 @@ private void configWatcher(Phase phase) { .yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java index 5266a869b1..77062d49a8 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java @@ -161,7 +161,7 @@ private void appA(Phase phase) { .yaml("ingress/spring-cloud-kubernetes-configuration-watcher-multiple-apps-ingress.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, ingress); @@ -173,7 +173,7 @@ private void appB(Phase phase) { V1Service service = (V1Service) util.yaml("app-b/app-b-service.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, null); @@ -187,7 +187,7 @@ private void configWatcher(Phase phase) { .yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, null, true); + util.createAndWait(NAMESPACE, deployment, service, null, true); } else if (phase.equals(Phase.DELETE)) { util.deleteAndWait(NAMESPACE, deployment, service, null); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java index b283ab8687..f627105c50 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java @@ -363,7 +363,7 @@ private static void manifests(Phase phase) { util.createAndWait(NAMESPACE, mountConfigMap, null); util.createAndWait("left", leftConfigMap, null); util.createAndWait("right", rightConfigMap, null); - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); } if (phase.equals(Phase.DELETE)) { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java index db09ca3bbf..d0a2a72ef9 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java @@ -149,7 +149,7 @@ private static void configK8sClientIt(Phase phase) { V1Secret secret = (V1Secret) util.yaml("secret.yaml"); if (phase.equals(Phase.CREATE)) { - util.createAndWait(NAMESPACE, null, deployment, service, ingress, true); + util.createAndWait(NAMESPACE, deployment, service, ingress, true); util.createAndWait(NAMESPACE, null, secret); } else if (phase.equals(Phase.DELETE)) { diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java index f37a17ee7e..d74ccf4f69 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java @@ -85,27 +85,39 @@ public static void loadBusybox(K3sContainer container) { } public static void loadWiremock(K3sContainer container) { - Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion()); + if (!imageAlreadyInK3s(container, WIREMOCK_TAR)) { + Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion()); + } } public static void loadIstioCtl(K3sContainer container) { - Commons.load(container, ISTIOCTL_TAR, ISTIOCTL, istioVersion()); + if (!imageAlreadyInK3s(container, ISTIOCTL_TAR)) { + Commons.load(container, ISTIOCTL_TAR, ISTIOCTL, istioVersion()); + } } public static void loadIstioProxyV2(K3sContainer container) { - Commons.load(container, ISTIO_PROXY_V2_TAR, ISTIO_PROXY_V2, istioVersion()); + if (!imageAlreadyInK3s(container, ISTIO_PROXY_V2_TAR)) { + Commons.load(container, ISTIO_PROXY_V2_TAR, ISTIO_PROXY_V2, istioVersion()); + } } public static void loadIstioPilot(K3sContainer container) { - Commons.load(container, ISTIO_PILOT_TAR, ISTIO_PILOT, istioVersion()); + if (!imageAlreadyInK3s(container, ISTIO_PILOT_TAR)) { + Commons.load(container, ISTIO_PILOT_TAR, ISTIO_PILOT, istioVersion()); + } } public static void loadKafka(K3sContainer container) { - Commons.load(container, KAFKA_TAR, KAFKA, kafkaVersion()); + if (!imageAlreadyInK3s(container, KAFKA_TAR)) { + Commons.load(container, KAFKA_TAR, KAFKA, kafkaVersion()); + } } public static void loadRabbitmq(K3sContainer container) { - Commons.load(container, RABBITMQ_TAR, RABBITMQ, rabbitMqVersion()); + if (!imageAlreadyInK3s(container, RABBITMQ_TAR)) { + Commons.load(container, RABBITMQ_TAR, RABBITMQ, rabbitMqVersion()); + } } private static boolean imageAlreadyInK3s(K3sContainer container, String tarName) { diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index cff24e87ff..edce3576d5 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -54,9 +54,7 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.fail; -import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.loadImage; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion; -import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pullImage; /** * @author wind57 @@ -65,15 +63,9 @@ public final class Util { private static final Log LOG = LogFactory.getLog(Util.class); - /** Image we get {@code istioctl} from in order to install Istio. */ - public static final String ISTIO_ISTIOCTL = "istio/istioctl"; - - private final K3sContainer container; - private final KubernetesClient client; public Util(K3sContainer container) { - this.container = container; this.client = new KubernetesClientBuilder().withConfig(Config.fromKubeconfig(container.getKubeConfigYaml())) .build(); } @@ -85,7 +77,7 @@ public Util(K3sContainer container) { * tight as possible, providing reasonable defaults. * */ - public void createAndWait(String namespace, String name, @Nullable Deployment deployment, @Nullable Service service, + public void createAndWait(String namespace, @Nullable Deployment deployment, @Nullable Service service, @Nullable Ingress ingress, boolean changeVersion) { try { @@ -104,11 +96,6 @@ public void createAndWait(String namespace, String name, @Nullable Deployment de .get(0) .setImage(imageFromDeployment + ":" + pomVersion()); } - else { - String[] image = imageFromDeployment.split(":", 2); - pullImage(image[0], image[1], container); - loadImage(image[0], image[1], name, container); - } client.apps().deployments().inNamespace(namespace).resource(deployment).create(); waitForDeployment(namespace, deployment); @@ -141,7 +128,7 @@ public void busybox(String namespace, Phase phase) { Service service = client.services().load(serviceStream).item(); if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, "busybox", deployment, service, null, false); + createAndWait(namespace, deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { deleteAndWait(namespace, deployment, service, null); @@ -311,7 +298,7 @@ public void setUpIstioctl(String namespace, Phase phase) { istioctlDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion); if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, null, istioctlDeployment, null, null, false); + createAndWait(namespace, istioctlDeployment, null, null, false); } else { deleteAndWait(namespace, istioctlDeployment, null, null); @@ -362,7 +349,7 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng deployment.getMetadata().setNamespace(namespace); service.getMetadata().setNamespace(namespace); - createAndWait(namespace, "wiremock", deployment, service, ingress, false); + createAndWait(namespace, deployment, service, ingress, false); } else { diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index c9de654263..7c6b58c31d 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -65,9 +65,7 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.fail; -import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.loadImage; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion; -import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pullImage; /** * @author wind57 @@ -84,8 +82,6 @@ public final class Util { private final RbacAuthorizationV1Api rbacApi; - private final K3sContainer container; - public Util(K3sContainer container) { ApiClient client; @@ -99,7 +95,6 @@ public Util(K3sContainer container) { client.setDebugging(false); Configuration.setDefaultApiClient(client); - this.container = container; this.coreV1Api = new CoreV1Api(); this.appsV1Api = new AppsV1Api(); this.networkingV1Api = new NetworkingV1Api(); @@ -113,8 +108,8 @@ public Util(K3sContainer container) { * tight as possible, providing reasonable defaults. * */ - public void createAndWait(String namespace, String name, V1Deployment deployment, V1Service service, - @Nullable V1Ingress ingress, boolean changeVersion) { + public void createAndWait(String namespace, V1Deployment deployment, V1Service service, @Nullable V1Ingress ingress, + boolean changeVersion) { try { coreV1Api.createNamespacedService(namespace, service, null, null, null, null); @@ -134,11 +129,6 @@ public void createAndWait(String namespace, String name, V1Deployment deployment .get(0) .setImage(imageFromDeployment + ":" + pomVersion()); } - else { - String[] image = imageFromDeployment.split(":", 2); - pullImage(image[0], image[1], container); - loadImage(image[0], image[1], name, container); - } appsV1Api.createNamespacedDeployment(namespace, deployment, null, null, null, null); waitForDeployment(namespace, deployment); @@ -252,7 +242,7 @@ public void busybox(String namespace, Phase phase) { V1Service service = (V1Service) yaml("busybox/service.yaml"); if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, "busybox", deployment, service, null, false); + createAndWait(namespace, deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { deleteAndWait(namespace, deployment, service, null); @@ -271,7 +261,7 @@ public void kafka(String namespace, Phase phase) { if (phase.equals(Phase.CREATE)) { createAndWait(namespace, configMap, null); - createAndWait(namespace, "kafka", deployment, service, null, false); + createAndWait(namespace, deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { deleteAndWait(namespace, configMap, null); @@ -289,7 +279,7 @@ public void rabbitMq(String namespace, Phase phase) { V1Service service = (V1Service) yaml("rabbitmq/rabbitmq-service.yaml"); if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, "rabbitmq", deployment, service, null, false); + createAndWait(namespace, deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { deleteAndWait(namespace, deployment, service, null); @@ -479,7 +469,7 @@ public void wiremock(String namespace, String path, Phase phase, boolean withIng deployment.getMetadata().setNamespace(namespace); service.getMetadata().setNamespace(namespace); - createAndWait(namespace, "wiremock", deployment, service, ingress, false); + createAndWait(namespace, deployment, service, ingress, false); } else { if (withIngress) {