Skip to content

Commit 7e79cbb

Browse files
wind57wind57
committed
Merge branch 'main' into fix-1715-drop-profiles-support
2 parents 9e4ca51 + 82a3764 commit 7e79cbb

File tree

18 files changed

+87
-312
lines changed

18 files changed

+87
-312
lines changed

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/TestAssertions.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323

2424
import org.assertj.core.api.Assertions;
2525
import org.awaitility.Awaitility;
26-
import reactor.netty.http.client.HttpClient;
27-
import reactor.util.retry.Retry;
28-
import reactor.util.retry.RetryBackoffSpec;
2926

3027
import org.springframework.boot.test.system.CapturedOutput;
3128
import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace;
@@ -34,11 +31,12 @@
3431
import org.springframework.core.ParameterizedTypeReference;
3532
import org.springframework.core.ResolvableType;
3633
import org.springframework.http.HttpMethod;
37-
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
3834
import org.springframework.web.reactive.function.client.WebClient;
3935

4036
import static org.assertj.core.api.Assertions.assertThat;
4137
import static org.awaitility.Awaitility.await;
38+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
39+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
4240

4341
/**
4442
* @author wind57
@@ -116,12 +114,4 @@ static void invokeAndAssert(Util util, Set<String> namespaces, int port, String
116114

117115
}
118116

119-
private static WebClient.Builder builder() {
120-
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
121-
}
122-
123-
private static RetryBackoffSpec retrySpec() {
124-
return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
125-
}
126-
127117
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
*/
4040
class Fabric8DiscoveryAllServicesIT extends Fabric8DiscoveryBase {
4141

42-
4342
private static Service externalServiceName;
4443

4544
@BeforeAll
@@ -50,10 +49,10 @@ static void beforeAllInNested() {
5049

5150
private void externalNameServices(Phase phase) {
5251
if (phase == Phase.CREATE) {
53-
util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);
52+
util.createAndWait(NAMESPACE, null, null, externalServiceName, true);
5453
}
5554
else {
56-
util.deleteAndWait(NAMESPACE, null, externalServiceName, null);
55+
util.deleteAndWait(NAMESPACE, null, externalServiceName);
5756
}
5857
}
5958

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat",
3535
"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
3636
"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches 'a-uat$'",
37-
"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
38-
})
37+
"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" })
3938
class Fabric8DiscoveryFilterMatchOneNamespaceIT extends Fabric8DiscoveryBase {
4039

4140
private static final String NAMESPACE_A_UAT = "a-uat";
@@ -52,16 +51,16 @@ void beforeEach() {
5251
util.createNamespace(NAMESPACE_A_UAT);
5352
util.createNamespace(NAMESPACE_B_UAT);
5453

55-
util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
56-
util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
54+
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
55+
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
5756

5857
}
5958

6059
@AfterEach
6160
void afterEach() {
6261

63-
util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
64-
util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
62+
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
63+
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
6564

6665
util.deleteNamespace(NAMESPACE_A_UAT);
6766
util.deleteNamespace(NAMESPACE_B_UAT);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
@TestPropertySource(properties = { "spring.cloud.kubernetes.discovery.namespaces[0]=a-uat",
3535
"spring.cloud.kubernetes.discovery.namespaces[1]=b-uat",
3636
"spring.cloud.kubernetes.discovery.filter=#root.metadata.namespace matches '^.*uat$'",
37-
"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG"
38-
})
37+
"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" })
3938
class Fabric8DiscoveryFilterMatchTwoNamespacesIT extends Fabric8DiscoveryBase {
4039

4140
private static final String NAMESPACE_A_UAT = "a-uat";
@@ -52,16 +51,16 @@ void beforeEach() {
5251
util.createNamespace(NAMESPACE_A_UAT);
5352
util.createNamespace(NAMESPACE_B_UAT);
5453

55-
util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
56-
util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
54+
util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
55+
util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
5756

5857
}
5958

6059
@AfterEach
6160
void afterEach() {
6261

63-
util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
64-
util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
62+
util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
63+
util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
6564

6665
util.deleteNamespace(NAMESPACE_A_UAT);
6766
util.deleteNamespace(NAMESPACE_B_UAT);

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/TestAssertions.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,20 @@
2222
import java.util.Map;
2323
import java.util.Objects;
2424

25-
import reactor.netty.http.client.HttpClient;
26-
import reactor.util.retry.Retry;
27-
import reactor.util.retry.RetryBackoffSpec;
28-
2925
import org.springframework.boot.test.json.BasicJsonTester;
3026
import org.springframework.boot.test.system.CapturedOutput;
3127
import org.springframework.cloud.client.ServiceInstance;
3228
import org.springframework.cloud.client.discovery.DiscoveryClient;
3329
import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
3430
import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
3531
import org.springframework.http.HttpMethod;
36-
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
3732
import org.springframework.web.reactive.function.client.WebClient;
3833

3934
import static java.util.AbstractMap.SimpleEntry;
4035
import static java.util.Map.Entry;
4136
import static org.assertj.core.api.Assertions.assertThat;
37+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
38+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
4239
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
4340

4441
/**
@@ -321,12 +318,4 @@ private static void waitForLogStatement(CapturedOutput output, String message) {
321318
.until(() -> output.getOut().contains(message));
322319
}
323320

324-
private static WebClient.Builder builder() {
325-
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
326-
}
327-
328-
private static RetryBackoffSpec retrySpec() {
329-
return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
330-
}
331-
332321
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/resources/bootstrap.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
logging:
2-
level:
3-
org:
4-
springframework: DEBUG
5-
61
spring:
72
cloud:
83
istio:

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,28 @@
1717
package org.springframework.cloud.kubernetes.fabric8.client.istio;
1818

1919
import java.io.InputStream;
20-
import java.time.Duration;
2120
import java.util.List;
22-
import java.util.Objects;
2321

2422
import io.fabric8.kubernetes.api.model.Service;
2523
import io.fabric8.kubernetes.api.model.apps.Deployment;
26-
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
2724
import io.fabric8.kubernetes.client.utils.Serialization;
2825
import org.junit.jupiter.api.AfterAll;
2926
import org.junit.jupiter.api.Assertions;
3027
import org.junit.jupiter.api.BeforeAll;
3128
import org.junit.jupiter.api.Test;
3229
import org.testcontainers.containers.Container;
3330
import org.testcontainers.k3s.K3sContainer;
34-
import reactor.netty.http.client.HttpClient;
35-
import reactor.util.retry.Retry;
36-
import reactor.util.retry.RetryBackoffSpec;
3731

3832
import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
3933
import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
4034
import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
4135
import org.springframework.cloud.kubernetes.integration.tests.commons.fabric8_client.Util;
4236
import org.springframework.http.HttpMethod;
43-
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
4437
import org.springframework.web.reactive.function.client.WebClient;
4538

39+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
40+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
41+
4642
/**
4743
* @author wind57
4844
*/
@@ -100,7 +96,7 @@ static void after() {
10096

10197
@Test
10298
void test() {
103-
WebClient client = builder().baseUrl("http://localhost/profiles").build();
99+
WebClient client = builder().baseUrl("http://localhost:32321/profiles").build();
104100

105101
@SuppressWarnings("unchecked")
106102
List<String> result = client.method(HttpMethod.GET)
@@ -117,30 +113,19 @@ private static void appManifests(Phase phase) {
117113

118114
InputStream deploymentStream = util.inputStream("istio-deployment.yaml");
119115
InputStream serviceStream = util.inputStream("istio-service.yaml");
120-
InputStream ingressStream = util.inputStream("istio-ingress.yaml");
121116

122117
Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class);
123-
124118
Service service = Serialization.unmarshal(serviceStream, Service.class);
125-
Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class);
126119

127120
if (phase.equals(Phase.CREATE)) {
128-
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
121+
util.createAndWait(NAMESPACE, null, deployment, service, true);
129122
}
130123
else {
131-
util.deleteAndWait(NAMESPACE, deployment, service, ingress);
124+
util.deleteAndWait(NAMESPACE, deployment, service);
132125
}
133126

134127
}
135128

136-
private WebClient.Builder builder() {
137-
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
138-
}
139-
140-
private RetryBackoffSpec retrySpec() {
141-
return Retry.fixedDelay(15, Duration.ofSeconds(1)).filter(Objects::nonNull);
142-
}
143-
144129
private static String istioctlPodName() {
145130
try {
146131
return K3S

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-ingress.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-service.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spec:
99
- name: http
1010
port: 8080
1111
targetPort: 8080
12+
nodePort: 32321
1213
selector:
1314
app: spring-cloud-kubernetes-fabric8-client-istio
14-
type: ClusterIP
15+
type: NodePort

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737

3838
import static org.assertj.core.api.Assertions.assertThat;
3939
import static org.awaitility.Awaitility.await;
40-
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.builder;
4140
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.manifests;
42-
import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.retrySpec;
41+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
42+
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
4343

4444
/**
4545
* @author wind57
@@ -95,7 +95,7 @@ void test() {
9595
Commons.waitForLogStatement("will add file-based property source : /tmp/application.properties", K3S,
9696
IMAGE_NAME);
9797
// (3)
98-
WebClient webClient = builder().baseUrl("http://localhost/key").build();
98+
WebClient webClient = builder().baseUrl("http://localhost:32321/key").build();
9999
String result = webClient.method(HttpMethod.GET)
100100
.retrieve()
101101
.bodyToMono(String.class)
@@ -112,7 +112,8 @@ void test() {
112112
configMap.setData(Map.of(Constants.APPLICATION_PROPERTIES, "from.properties.key=as-mount-changed"));
113113
client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
114114

115-
await().timeout(Duration.ofSeconds(360))
115+
await().atMost(Duration.ofSeconds(120))
116+
.pollInterval(Duration.ofSeconds(1))
116117
.until(() -> webClient.method(HttpMethod.GET)
117118
.retrieve()
118119
.bodyToMono(String.class)

0 commit comments

Comments
 (0)