Skip to content

Commit 58029b8

Browse files
wind57wind57
committed
Merge branch '3.1.x' into refactor-k8s-client-catalog-watcher-it
2 parents 5c0be41 + 1eec4a0 commit 58029b8

File tree

25 files changed

+107
-607
lines changed

25 files changed

+107
-607
lines changed

‎.github/dco.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require:
2+
members: false

‎.github/workflows/maven.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: github-workflow
22

33
on:
44
push:
5-
branches: [ main, 3.0.x, 3.1.x ]
5+
branches: [ main, 3.0.x, 3.1.x, 3.2.x ]
66
pull_request:
7-
branches: [ main, 3.0.x, 3.1.x ]
7+
branches: [ main, 3.0.x, 3.1.x, 3.2.x ]
88

99
jobs:
1010
build:

‎README.adoc‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,34 @@ Edit the files in the src/main/asciidoc/ directory instead.
55
////
66

77

8+
[[spring-cloud-kubernetes]]
9+
= Spring Cloud Kubernetes
10+
11+
This reference guide covers how to use Spring Cloud Kubernetes.
12+
13+
[[why-do-you-need-spring-cloud-kubernetes]]
14+
== Why do you need Spring Cloud Kubernetes?
15+
16+
Spring Cloud Kubernetes provides implementations of well known Spring Cloud interfaces allowing developers to build and run Spring Cloud applications on Kubernetes. While this project may be useful to you when building a cloud native application, it is also not a requirement in order to deploy a Spring Boot app on Kubernetes. If you are just getting started in your journey to running your Spring Boot app on Kubernetes you can accomplish a lot with nothing more than a basic Spring Boot app and Kubernetes itself. To learn more, you can get started by reading the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cloud-deployment-kubernetes[Spring Boot reference documentation for deploying to Kubernetes ] and also working through the workshop material https://hackmd.io/@ryanjbaxter/spring-on-k8s-workshop[Spring and Kubernetes].
17+
18+
[[configuration-properties]]
19+
== Configuration properties
20+
21+
To see the list of all Kubernetes related configuration properties please check link:appendix.html[the Appendix page].
22+
23+
[[building]]
24+
== Building
25+
26+
Click https://docs.spring.io/spring-cloud-build/reference/building.html[here] for basic building instructions.
27+
28+
29+
[[contributing]]
30+
== Contributing
31+
32+
Click https://docs.spring.io/spring-cloud-build/reference/contributing.html[here] for instructions on contributing to this project.
33+
34+
35+
[[aot-and-native-image-support]]
36+
== AOT and native image support
37+
38+
At this point, Spring Cloud Kubernetes does not support Spring Boot AOT transformations or native images. Partial support might be added in future releases.

‎docs/modules/ROOT/pages/spring-cloud-kubernetes.adoc‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@ This reference guide covers how to use Spring Cloud Kubernetes.
88

99
Spring Cloud Kubernetes provides implementations of well known Spring Cloud interfaces allowing developers to build and run Spring Cloud applications on Kubernetes. While this project may be useful to you when building a cloud native application, it is also not a requirement in order to deploy a Spring Boot app on Kubernetes. If you are just getting started in your journey to running your Spring Boot app on Kubernetes you can accomplish a lot with nothing more than a basic Spring Boot app and Kubernetes itself. To learn more, you can get started by reading the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cloud-deployment-kubernetes[Spring Boot reference documentation for deploying to Kubernetes ] and also working through the workshop material https://hackmd.io/@ryanjbaxter/spring-on-k8s-workshop[Spring and Kubernetes].
1010

11-
12-
13-
14-
15-
16-
17-
18-
19-
20-
21-
22-
23-
24-
25-
26-
2711
[[configuration-properties]]
2812
== Configuration properties
2913

‎docs/src/main/asciidoc/README.adoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include::../../../modules/ROOT/pages/spring-cloud-kubernetes.adoc[]

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
<surefire-reports-directory>surefire-reports</surefire-reports-directory>
7070
<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
7171
<!-- Dependency Versions -->
72-
<spring-cloud-commons.version>4.1.5</spring-cloud-commons.version>
72+
<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
7373
<spring-cloud-config.version>4.1.6-SNAPSHOT</spring-cloud-config.version>
74-
<spring-cloud-bus.version>4.1.3</spring-cloud-bus.version>
75-
<spring-cloud-contract.version>4.1.5</spring-cloud-contract.version>
74+
<spring-cloud-bus.version>4.1.4-SNAPSHOT</spring-cloud-bus.version>
75+
<spring-cloud-contract.version>4.1.6-SNAPSHOT</spring-cloud-contract.version>
7676

7777
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
7878
<maven-checkstyle-plugin.failsOnViolation>true

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ protected static void beforeAll() {
6060
util = new Util(K3S);
6161
}
6262

63-
protected static KubernetesDiscoveryProperties discoveryProperties(boolean useEndpointSlices) {
64-
return new KubernetesDiscoveryProperties(true, false, Set.of(NAMESPACE, NAMESPACE_A), true, 60, false, null,
63+
protected static KubernetesDiscoveryProperties discoveryProperties(boolean useEndpointSlices,
64+
Set<String> discoveryNamespaces) {
65+
return new KubernetesDiscoveryProperties(true, false, discoveryNamespaces, true, 60, false, null,
6566
Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, useEndpointSlices,
6667
false, null);
6768
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT.java‎ renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchEndpointSlicesFilterIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Primary;
3636

37-
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT.TestConfig;
37+
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchEndpointSlicesFilterIT.TestConfig;
3838
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.assertLogStatement;
3939
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.invokeAndAssert;
4040

@@ -43,7 +43,7 @@
4343
*/
4444
@SpringBootTest(classes = { KubernetesCatalogWatchAutoConfiguration.class, TestConfig.class, Application.class },
4545
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
46-
class Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT extends Fabric8CatalogWatchBase {
46+
class Fabric8CatalogWatchEndpointSlicesFilterIT extends Fabric8CatalogWatchBase {
4747

4848
@LocalServerPort
4949
private int port;
@@ -96,7 +96,7 @@ KubernetesClient kubernetesClient() {
9696
@Bean
9797
@Primary
9898
KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
99-
return discoveryProperties(true);
99+
return discoveryProperties(true, Set.of(NAMESPACE, NAMESPACE_A));
100100
}
101101

102102
}

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT.java‎ renamed to ‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchEndpointsIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Primary;
3636

37-
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT.TestConfig;
37+
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchEndpointsIT.TestConfig;
3838
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.assertLogStatement;
3939
import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.invokeAndAssert;
4040

@@ -43,7 +43,7 @@
4343
*/
4444
@SpringBootTest(classes = { KubernetesCatalogWatchAutoConfiguration.class, TestConfig.class, Application.class },
4545
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
46-
class Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT extends Fabric8CatalogWatchBase {
46+
class Fabric8CatalogWatchEndpointsIT extends Fabric8CatalogWatchBase {
4747

4848
@LocalServerPort
4949
private int port;
@@ -96,7 +96,7 @@ KubernetesClient kubernetesClient() {
9696
@Bean
9797
@Primary
9898
KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
99-
return discoveryProperties(false);
99+
return discoveryProperties(false, Set.of(NAMESPACE, NAMESPACE_A));
100100
}
101101

102102
}

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

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

0 commit comments

Comments
 (0)