From aabc667e391a26ddbe266c8b7bab08a4d3590ba9 Mon Sep 17 00:00:00 2001 From: wind57 Date: Tue, 14 Jan 2025 20:34:21 +0200 Subject: [PATCH 1/4] placeholder commit Signed-off-by: wind57 From d3014fe111fda6cf5ed53cda791f16aa7e2b2f8e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 16 Jan 2025 12:57:46 -0500 Subject: [PATCH 2/4] DCO changes Signed-off-by: wind57 --- .github/dco.yml | 2 ++ README.adoc | 31 +++++++++++++++++++ .../ROOT/pages/spring-cloud-kubernetes.adoc | 16 ---------- docs/src/main/asciidoc/README.adoc | 1 + 4 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 .github/dco.yml diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 0000000000..0c4b142e9a --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false diff --git a/README.adoc b/README.adoc index 66e1ebf2d4..d45a49bc79 100644 --- a/README.adoc +++ b/README.adoc @@ -5,3 +5,34 @@ Edit the files in the src/main/asciidoc/ directory instead. //// +[[spring-cloud-kubernetes]] += Spring Cloud Kubernetes + +This reference guide covers how to use Spring Cloud Kubernetes. + +[[why-do-you-need-spring-cloud-kubernetes]] +== Why do you need Spring Cloud Kubernetes? + +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]. + +[[configuration-properties]] +== Configuration properties + +To see the list of all Kubernetes related configuration properties please check link:appendix.html[the Appendix page]. + +[[building]] +== Building + +Click https://docs.spring.io/spring-cloud-build/reference/building.html[here] for basic building instructions. + + +[[contributing]] +== Contributing + +Click https://docs.spring.io/spring-cloud-build/reference/contributing.html[here] for instructions on contributing to this project. + + +[[aot-and-native-image-support]] +== AOT and native image support + +At this point, Spring Cloud Kubernetes does not support Spring Boot AOT transformations or native images. Partial support might be added in future releases. diff --git a/docs/modules/ROOT/pages/spring-cloud-kubernetes.adoc b/docs/modules/ROOT/pages/spring-cloud-kubernetes.adoc index 1424061342..327adc47b4 100644 --- a/docs/modules/ROOT/pages/spring-cloud-kubernetes.adoc +++ b/docs/modules/ROOT/pages/spring-cloud-kubernetes.adoc @@ -8,22 +8,6 @@ This reference guide covers how to use Spring Cloud Kubernetes. 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]. - - - - - - - - - - - - - - - - [[configuration-properties]] == Configuration properties diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index e69de29bb2..422ccd9a57 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -0,0 +1 @@ +include::../../../modules/ROOT/pages/spring-cloud-kubernetes.adoc[] From 56da3591a7c570362ff3eae10de07b4d0207036d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 16 Jan 2025 13:04:01 -0500 Subject: [PATCH 3/4] Building 3.2.x branch Signed-off-by: wind57 --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 8c6e6afc96..0bf4f9868d 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -2,9 +2,9 @@ name: github-workflow on: push: - branches: [ main, 3.0.x, 3.1.x ] + branches: [ main, 3.0.x, 3.1.x, 3.2.x ] pull_request: - branches: [ main, 3.0.x, 3.1.x ] + branches: [ main, 3.0.x, 3.1.x, 3.2.x ] jobs: build: From f1bd2d4e9aef27e2de087561e02e7a4b2778b94b Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 16 Jan 2025 23:31:23 +0200 Subject: [PATCH 4/4] fix Signed-off-by: wind57 --- .../src/main/resources/application-mount.yaml | 4 ++-- .../src/main/resources/application-no-mount.yaml | 4 ++-- .../src/main/resources/application-with-bootstrap.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml index a035e13da0..2edaa955b0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml @@ -6,9 +6,9 @@ spring: reload: enabled: true monitoring-config-maps: true - strategy: shutdown + strategy: refresh mode: polling - period: 5000 + period: 5s config: paths: - /tmp/application.properties diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml index 12bc7a05fd..4e98ed7073 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml @@ -8,7 +8,7 @@ spring: reload: enabled: true monitoring-config-maps: true - strategy: shutdown + strategy: refresh mode: polling - period: 5000 + period: 5s diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml index c997322d16..2f71477613 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml @@ -6,7 +6,7 @@ spring: reload: enabled: true monitoring-config-maps: true - strategy: shutdown + strategy: refresh mode: polling - period: 5000 + period: 5s