From 95e49167a647cc01b64fc4af7a1fab5456a29fa2 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 30 Apr 2024 14:18:02 +0300 Subject: [PATCH] Load images (#1649) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .../commons/leader/LeaderInitiator.java | 4 ++-- .../fabric8/client/istio/Fabric8IstioIT.java | 4 +++- .../integration/tests/commons/Images.java | 24 +++++++++++++++---- .../tests/commons/fabric8_client/Util.java | 2 +- .../src/main/resources/current-images.txt | 2 ++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderInitiator.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderInitiator.java index 1b51562e..ebf0e332 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderInitiator.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderInitiator.java @@ -63,8 +63,8 @@ public class LeaderInitiator implements SmartLifecycle { hostPodWatcher.start(); scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); scheduledExecutorService.scheduleAtFixedRate(leadershipController::update, - leaderProperties.getUpdatePeriod().toMillis(), - leaderProperties.getUpdatePeriod().toMillis(), TimeUnit.MILLISECONDS); + leaderProperties.getUpdatePeriod().toMillis(), leaderProperties.getUpdatePeriod().toMillis(), + TimeUnit.MILLISECONDS); isRunning = true; } } 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 5cd75c50..efdb91bd 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 @@ -65,7 +65,9 @@ class Fabric8IstioIT { Commons.validateImage(IMAGE_NAME, K3S); Commons.loadSpringCloudKubernetesImage(IMAGE_NAME, K3S); - Images.loadIstioctl(K3S); + Images.loadIstioCtl(K3S); + Images.loadIstioProxyV2(K3S); + Images.loadIstioPilot(K3S); processExecResult(K3S.execInContainer("sh", "-c", "kubectl create namespace istio-test")); processExecResult( 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 06a82370..5c672334 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 @@ -36,7 +36,15 @@ public final class Images { private static final String ISTIOCTL = "istio/istioctl"; - private static final String ISTIOCTL_TAR = ISTIOCTL.replace('/', '-') + ":" + istioctlVersion(); + private static final String ISTIOCTL_TAR = ISTIOCTL.replace('/', '-') + ":" + istioVersion(); + + private static final String ISTIO_PROXY_V2 = "istio/proxyv2"; + + private static final String ISTIO_PROXY_V2_TAR = ISTIO_PROXY_V2.replace('/', '-') + ":" + istioVersion(); + + private static final String ISTIO_PILOT = "istio/istioctl"; + + private static final String ISTIO_PILOT_TAR = ISTIO_PILOT.replace('/', '-') + ":" + istioVersion(); private static final String KAFKA = "confluentinc/cp-kafka"; @@ -54,7 +62,7 @@ public final class Images { return imageVersion(BUSYBOX); } - public static String istioctlVersion() { + public static String istioVersion() { return imageVersion(ISTIOCTL); } @@ -78,8 +86,16 @@ public final class Images { Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion()); } - public static void loadIstioctl(K3sContainer container) { - Commons.load(container, ISTIOCTL_TAR, ISTIOCTL, istioctlVersion()); + public static void loadIstioCtl(K3sContainer container) { + Commons.load(container, ISTIOCTL_TAR, ISTIOCTL, istioVersion()); + } + + public static void loadIstioProxyV2(K3sContainer container) { + 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()); } public static void loadKafka(K3sContainer container) { 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 fe01d531..9e7b9917 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 @@ -267,7 +267,7 @@ public final class Util { String imageWithoutVersion = istioctlDeployment.getSpec().getTemplate().getSpec().getContainers().get(0) .getImage(); - String imageWithVersion = imageWithoutVersion + ":" + Images.istioctlVersion(); + String imageWithVersion = imageWithoutVersion + ":" + Images.istioVersion(); istioctlDeployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion); if (phase.equals(Phase.CREATE)) { diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt b/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt index de0626cd..34d43710 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt +++ b/spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt @@ -1,5 +1,7 @@ busybox:1.36.1 istio/istioctl:1.20.5 +istio/proxyv2:1.20.5 +istio/pilot:1.20.5 confluentinc/cp-kafka:7.2.1 rabbitmq:3-management wiremock/wiremock:3.4.2