Merge branch '3.1.x'

Author: ryanjbaxter

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);

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<String> profiles() {
+	List<String> profiles() {
 		return Arrays.asList(environment.getActiveProfiles());
 	}
 

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