Skip to content

Commit

Permalink
Bumping versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@spring-builds
spring-builds committed Oct 7, 2023
1 parent 03ddc2b commit 51a375e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .../cloud/kubernetes/fabric8/reload/BootstrapEnabledPollingReloadConfigMapMountDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ static void testPollingReloadConfigMapWithBootstrap(KubernetesClient client, Uti
appLabelValue);
// (3)
WebClient webClient = TestUtil.builder().baseUrl("http://localhost/key").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();

// we first read the initial value from the configmap
Assertions.assertEquals("as-mount-initial", result);
Expand Down
4 changes: 2 additions & 2 deletions .../springframework/cloud/kubernetes/fabric8/reload/ConfigMapMountPollingReloadDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ static void testConfigMapMountPollingReload(KubernetesClient client, Util util,
appLabelValue);
// (3)
WebClient webClient = TestUtil.builder().baseUrl("http://localhost/key").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();

// we first read the initial value from the configmap
Assertions.assertEquals("as-mount-initial", result);
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/springframework/cloud/kubernetes/fabric8/reload/ConfigMapPollingReloadDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ final class ConfigMapPollingReloadDelegate {

static void testConfigMapPollingReload(KubernetesClient client) {
WebClient webClient = TestUtil.builder().baseUrl("http://localhost/key").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();

// we first read the initial value from the configmap
Assertions.assertEquals("as-mount-initial", result);
Expand All @@ -53,8 +53,8 @@ static void testConfigMapPollingReload(KubernetesClient client) {
client.configMaps().inNamespace("default").resource(map).createOrReplace();

await().ignoreException(HttpServerErrorException.BadGateway.class).timeout(Duration.ofSeconds(120))
.until(() -> webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block().equals("after-change"));
.until(() -> webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block().equals("after-change"));

}

Expand Down
19 changes: 10 additions & 9 deletions ...c/test/java/org/springframework/cloud/kubernetes/fabric8/reload/Fabric8EventReloadIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,16 @@ void testInformFromOneNamespaceEventNotTriggered() {
"added secret informer for namespace", IMAGE_NAME);

WebClient webClient = TestUtil.builder().baseUrl("http://localhost/left").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();

// we first read the initial value from the left-configmap
Assertions.assertEquals("left-initial", result);

// then read the value from the right-configmap
webClient = TestUtil.builder().baseUrl("http://localhost/right").build();
result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec()).block();
result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
Assertions.assertEquals("right-initial", result);

// then deploy a new version of right-configmap
Expand Down Expand Up @@ -158,8 +159,8 @@ void testInformFromOneNamespaceEventTriggered() {

// read the value from the right-configmap
WebClient webClient = TestUtil.builder().baseUrl("http://localhost/right").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();
Assertions.assertEquals("right-initial", result);

// then deploy a new version of right-configmap
Expand Down Expand Up @@ -246,8 +247,8 @@ void testInform() {

// right-configmap now will see the new value also, but only because the other
// configmap has triggered the restart
rightResult = rightWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
rightResult = rightWebClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();
Assertions.assertEquals("right-after-change", rightResult);
}

Expand All @@ -271,8 +272,8 @@ void testInformFromOneNamespaceEventTriggeredSecretsDisabled() {

// read the value from the right-configmap
WebClient webClient = TestUtil.builder().baseUrl("http://localhost/right").build();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(TestUtil.retrySpec())
.block();
String result = webClient.method(HttpMethod.GET).retrieve().bodyToMono(String.class)
.retryWhen(TestUtil.retrySpec()).block();
Assertions.assertEquals("right-initial", result);

// then deploy a new version of right-configmap
Expand Down

1 comment on commit 51a375e

@wind57
Copy link
Contributor

@wind57 wind57 commented on 51a375e Oct 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that the build failed, I am looking why

Please sign in to comment.