Skip to content

Commit efeb7b4

Browse files
wind57wind57
committed
Merge branch 'main' into fix-1715-drop-profiles-support
2 parents 8298be4 + ad6fb23 commit efeb7b4

File tree

70 files changed

+112
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+112
-101
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.1.x, 3.0.x ]
5+
branches: [ main, 3.0.x, 3.1.x, 3.2.x ]
66
pull_request:
7-
branches: [ main, 3.1.x, 3.0.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/how-to/deployment/cloud.html#howto.deployment.cloud.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/how-to/deployment/cloud.html#howto.deployment.cloud.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/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.cloud</groupId>
1010
<artifactId>spring-cloud-kubernetes</artifactId>
11-
<version>3.2.1-SNAPSHOT</version>
11+
<version>3.3.0-SNAPSHOT</version>
1212
<relativePath>..</relativePath>
1313
</parent>
1414
<packaging>jar</packaging>

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
<parent>
2626
<groupId>org.springframework.cloud</groupId>
2727
<artifactId>spring-cloud-build</artifactId>
28-
<version>4.2.1-SNAPSHOT</version>
28+
<version>4.3.0-SNAPSHOT</version>
2929
<relativePath/>
3030
</parent>
3131

3232
<artifactId>spring-cloud-kubernetes</artifactId>
33-
<version>3.2.1-SNAPSHOT</version>
33+
<version>3.3.0-SNAPSHOT</version>
3434
<packaging>pom</packaging>
3535
<name>Spring Cloud Kubernetes</name>
3636

@@ -70,10 +70,10 @@
7070
<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
7171
<!-- Dependency Versions -->
7272
<mockito-inline.version>4.8.1</mockito-inline.version>
73-
<spring-cloud-commons.version>4.2.1-SNAPSHOT</spring-cloud-commons.version>
74-
<spring-cloud-config.version>4.2.1-SNAPSHOT</spring-cloud-config.version>
75-
<spring-cloud-bus.version>4.2.1-SNAPSHOT</spring-cloud-bus.version>
76-
<spring-cloud-contract.version>4.2.1-SNAPSHOT</spring-cloud-contract.version>
73+
<spring-cloud-commons.version>4.3.0-SNAPSHOT</spring-cloud-commons.version>
74+
<spring-cloud-config.version>4.3.0-SNAPSHOT</spring-cloud-config.version>
75+
<spring-cloud-bus.version>4.3.0-SNAPSHOT</spring-cloud-bus.version>
76+
<spring-cloud-contract.version>4.3.0-SNAPSHOT</spring-cloud-contract.version>
7777

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

‎spring-cloud-kubernetes-client-autoconfig/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>3.2.1-SNAPSHOT</version>
8+
<version>3.3.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-cloud-kubernetes-client-config/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>3.2.1-SNAPSHOT</version>
8+
<version>3.3.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.junit.jupiter.api.AfterAll;
3838
import org.junit.jupiter.api.BeforeAll;
3939
import org.junit.jupiter.api.Test;
40-
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
4140
import org.junit.jupiter.api.extension.ExtendWith;
4241

4342
import org.springframework.boot.test.context.SpringBootTest;
@@ -115,8 +114,6 @@ static void after() {
115114
* - second polling cycle reads sources from k8s and finds a change
116115
* </pre>
117116
*/
118-
@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
119-
disabledReason = "failing on jenkins")
120117
@Test
121118
void test(CapturedOutput output) {
122119

0 commit comments

Comments
 (0)