Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fabric8 istio IT upgrade (3) #1760

Merged
merged 5 commits into from
Dec 6, 2024
Merged

fabric8 istio IT upgrade (3) #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f73a607
just upgrade
wind57 Oct 9, 2024
bd35e79
Merge branch '3.1.x' into refactor-integration-tests-3-just-upgrade-i…
wind57 Nov 30, 2024
2377295
lower visibility
wind57 Nov 30, 2024
a0103d2
Merge branch '3.1.x' into refactor-integration-tests-3-just-upgrade-i…
wind57 Dec 4, 2024
a063933
Merge branch '3.1.x' into refactor-integration-tests-3-just-upgrade-i…
wind57 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tio/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @author wind57
*/
@SpringBootApplication
public class IstioApp {
class IstioApp {

public static void main(String[] args) {
SpringApplication.run(IstioApp.class, args);
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/org/springframework/cloud/kubernetes/fabric8/client/istio/IstioController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
6 changes: 3 additions & 3 deletions spring-cloud-kubernetes-test-support/src/main/resources/current-images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading