SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2024-12-06 15:00:17 -05:00
parent 03089b194a 776ec1ed4b
commit e7afe8e497
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java
View File

@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author wind57
*/
@SpringBootApplication
public class IstioApp {
class IstioApp {
public static void main(String[] args) {
SpringApplication.run(IstioApp.class, args);

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java
View File

@@ -29,20 +29,20 @@ import org.springframework.web.bind.annotation.RestController;
* @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());
}

6
spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt
View File

@@ -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