diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java index d5626db45d..58efc873a5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java @@ -23,7 +23,7 @@ * @author wind57 */ @SpringBootApplication -public class IstioApp { +class IstioApp { public static void main(String[] args) { SpringApplication.run(IstioApp.class, args); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java index 09e27f99fb..8ed560b0b5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java @@ -29,20 +29,20 @@ * @author wind57 */ @RestController -public class IstioController { +class IstioController { private final Environment environment; // not used, but just to prove that it is injected private final IstioClient istioClient; - public IstioController(Environment environment, IstioClient istioClient) { + IstioController(Environment environment, IstioClient istioClient) { this.environment = environment; this.istioClient = istioClient; } @GetMapping("/profiles") - public List profiles() { + List profiles() { return Arrays.asList(environment.getActiveProfiles()); } 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 34d4371080..2853673403 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,7 +1,7 @@ busybox:1.36.1 -istio/istioctl:1.20.5 -istio/proxyv2:1.20.5 -istio/pilot:1.20.5 +istio/istioctl:1.21.6 +istio/proxyv2:1.21.6 +istio/pilot:1.21.6 confluentinc/cp-kafka:7.2.1 rabbitmq:3-management wiremock/wiremock:3.4.2