From d22a119c56c85d5f12e4374fd3c0b7353e79926a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:21:52 +0000 Subject: [PATCH] Release 2.11.1 --- pom.xml | 2 +- spring-cloud-common-security-config/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- spring-cloud-dataflow-aggregate-task/pom.xml | 2 +- spring-cloud-dataflow-audit/pom.xml | 2 +- spring-cloud-dataflow-autoconfigure/pom.xml | 2 +- spring-cloud-dataflow-build/pom.xml | 6 +- .../pom.xml | 2 +- .../spring-cloud-dataflow-build-tools/pom.xml | 2 +- .../pom.xml | 4 +- spring-cloud-dataflow-classic-docs/pom.xml | 2 +- spring-cloud-dataflow-common/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-completion/pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-core-dsl/pom.xml | 2 +- spring-cloud-dataflow-core/pom.xml | 2 +- spring-cloud-dataflow-dependencies/pom.xml | 4 +- spring-cloud-dataflow-docs/pom.xml | 2 +- spring-cloud-dataflow-package/pom.xml | 2 +- spring-cloud-dataflow-parent/pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-registry/pom.xml | 2 +- spring-cloud-dataflow-rest-client/pom.xml | 2 +- spring-cloud-dataflow-rest-resource/pom.xml | 2 +- spring-cloud-dataflow-schema-core/pom.xml | 2 +- spring-cloud-dataflow-schema/pom.xml | 2 +- spring-cloud-dataflow-server-core/pom.xml | 2 +- spring-cloud-dataflow-server/pom.xml | 2 +- spring-cloud-dataflow-shell-core/pom.xml | 2 +- spring-cloud-dataflow-shell/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-tasklauncher/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 2 +- spring-cloud-dataflow-test/pom.xml | 2 +- spring-cloud-skipper/pom.xml | 6 +- .../pom.xml | 2 +- .../spring-cloud-skipper-client/pom.xml | 2 +- .../spring-cloud-skipper-dependencies/pom.xml | 4 +- .../spring-cloud-skipper-docs/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-skipper-server-core/pom.xml | 2 +- .../spring-cloud-skipper-server/pom.xml | 4 +- .../pom.xml | 2 +- .../spring-cloud-skipper-shell/pom.xml | 2 +- .../spring-cloud-skipper/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-dataflow-server/pom.xml | 2 +- spring-cloud-starter-dataflow-ui/pom.xml | 2 +- src/deploy/versions.yaml | 4 +- src/docker-compose/.env | 4 +- src/docker-compose/docker-compose-dood.yml | 8 +- .../docker-compose-influxdb.yml | 4 +- .../docker-compose-postgres.yml | 14 ++-- .../docker-compose-prometheus.yml | 4 +- .../docker-compose-rabbitmq.yml | 25 +++--- src/docker-compose/docker-compose-zipkin.yml | 2 +- src/docker-compose/docker-compose.yml | 71 +++++++++++++--- .../grafana/grafana-deployment.yaml | 2 +- src/kubernetes/kafka/kafka-deployment.yaml | 5 +- src/kubernetes/kafka/kafka-svc.yaml | 1 + src/kubernetes/kafka/kafka-zk-deployment.yaml | 1 - .../mariadb/mariadb-deployment.yaml | 7 +- .../prometheus-proxy-clusterrolebinding.yaml | 2 +- .../prometheus-proxy-deployment.yaml | 3 - .../prometheus-proxy-serviceaccount.yaml | 2 +- .../prometheus-clusterrolebinding.yaml | 2 +- .../prometheus/prometheus-configmap.yaml | 59 ++++++++----- .../prometheus/prometheus-deployment.yaml | 5 +- .../prometheus/prometheus-serviceaccount.yaml | 2 +- .../rabbitmq/rabbitmq-deployment.yaml | 22 ++--- src/kubernetes/rabbitmq/rabbitmq-svc.yaml | 8 +- src/kubernetes/server/server-config.yaml | 6 +- src/kubernetes/server/server-deployment.yaml | 84 +++++++++---------- src/kubernetes/server/server-svc.yaml | 2 +- .../skipper/skipper-config-kafka.yaml | 12 +-- .../skipper/skipper-config-rabbit.yaml | 13 +-- .../skipper/skipper-deployment.yaml | 43 +++++----- 92 files changed, 304 insertions(+), 281 deletions(-) diff --git a/pom.xml b/pom.xml index 21f964e841..f9e712463f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-dataflow - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow Spring Cloud Dataflow pom diff --git a/spring-cloud-common-security-config/pom.xml b/spring-cloud-common-security-config/pom.xml index a3a656fa78..2ce6af30b5 100644 --- a/spring-cloud-common-security-config/pom.xml +++ b/spring-cloud-common-security-config/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-common-security-config - 2.11.1-SNAPSHOT + 2.11.1 pom spring-cloud-common-security-config Spring Cloud Common Security Config @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-dataflow-build - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-build diff --git a/spring-cloud-common-security-config/spring-cloud-common-security-config-core/pom.xml b/spring-cloud-common-security-config/spring-cloud-common-security-config-core/pom.xml index b0613aec68..51eb3ebf25 100644 --- a/spring-cloud-common-security-config/spring-cloud-common-security-config-core/pom.xml +++ b/spring-cloud-common-security-config/spring-cloud-common-security-config-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-common-security-config - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-common-security-config-core spring-cloud-common-security-config-core diff --git a/spring-cloud-common-security-config/spring-cloud-common-security-config-web/pom.xml b/spring-cloud-common-security-config/spring-cloud-common-security-config-web/pom.xml index 3fb890c379..6a7b0e6672 100644 --- a/spring-cloud-common-security-config/spring-cloud-common-security-config-web/pom.xml +++ b/spring-cloud-common-security-config/spring-cloud-common-security-config-web/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-common-security-config - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-common-security-config-web spring-cloud-common-security-config-web @@ -18,7 +18,7 @@ org.springframework.cloud spring-cloud-common-security-config-core - 2.11.1-SNAPSHOT + 2.11.1 org.springframework.security diff --git a/spring-cloud-common-security-config/spring-cloud-starter-common-security-config-web/pom.xml b/spring-cloud-common-security-config/spring-cloud-starter-common-security-config-web/pom.xml index 0915bdc747..25615ca584 100644 --- a/spring-cloud-common-security-config/spring-cloud-starter-common-security-config-web/pom.xml +++ b/spring-cloud-common-security-config/spring-cloud-starter-common-security-config-web/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-common-security-config - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-starter-common-security-config-web spring-cloud-starter-common-security-config-web diff --git a/spring-cloud-dataflow-aggregate-task/pom.xml b/spring-cloud-dataflow-aggregate-task/pom.xml index 38958eff33..815773b8a3 100644 --- a/spring-cloud-dataflow-aggregate-task/pom.xml +++ b/spring-cloud-dataflow-aggregate-task/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-aggregate-task diff --git a/spring-cloud-dataflow-audit/pom.xml b/spring-cloud-dataflow-audit/pom.xml index f4a184b031..049d404b91 100644 --- a/spring-cloud-dataflow-audit/pom.xml +++ b/spring-cloud-dataflow-audit/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dataflow-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-audit diff --git a/spring-cloud-dataflow-autoconfigure/pom.xml b/spring-cloud-dataflow-autoconfigure/pom.xml index fbc1fe32a3..9d2108cb6d 100644 --- a/spring-cloud-dataflow-autoconfigure/pom.xml +++ b/spring-cloud-dataflow-autoconfigure/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-autoconfigure diff --git a/spring-cloud-dataflow-build/pom.xml b/spring-cloud-dataflow-build/pom.xml index 39b51e2e44..c3dea08b61 100644 --- a/spring-cloud-dataflow-build/pom.xml +++ b/spring-cloud-dataflow-build/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-dataflow-build - 2.11.1-SNAPSHOT + 2.11.1 pom Spring Cloud Dataflow Build Spring Cloud Dataflow Build, managing plugins and dependencies @@ -22,7 +22,7 @@ ${project.artifactId} 2.7.16 - 2.11.1-SNAPSHOT + 2.11.1 ${project.build.directory}/build-docs ${project.build.directory}/refdocs/ 0.1.3.RELEASE @@ -96,7 +96,7 @@ org.springframework.cloud spring-cloud-dataflow-build-dependencies - 2.11.1-SNAPSHOT + 2.11.1 pom import diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml index ca8059e848..a178ac4df5 100644 --- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml +++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.cloud spring-cloud-dataflow-build-dependencies - 2.11.1-SNAPSHOT + 2.11.1 Spring Cloud Dataflow Build Dependencies pom Spring Cloud Dataflow Build Dependencies: an internal BOM for use with Spring diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-tools/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-tools/pom.xml index 29fb7393bd..c784273703 100644 --- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-tools/pom.xml +++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-tools/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-dataflow-build - 2.11.1-SNAPSHOT + 2.11.1 diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml index 00b536639d..1240dbfefb 100644 --- a/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml +++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow-dependencies-parent pom Spring Cloud Dataflow Dependencies Parent @@ -37,7 +37,7 @@ UTF-8 - 2.11.1-SNAPSHOT + 2.11.1 diff --git a/spring-cloud-dataflow-classic-docs/pom.xml b/spring-cloud-dataflow-classic-docs/pom.xml index fe2ba1988b..5f0d93a887 100644 --- a/spring-cloud-dataflow-classic-docs/pom.xml +++ b/spring-cloud-dataflow-classic-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-classic-docs diff --git a/spring-cloud-dataflow-common/pom.xml b/spring-cloud-dataflow-common/pom.xml index 9738944346..bee60f9c59 100644 --- a/spring-cloud-dataflow-common/pom.xml +++ b/spring-cloud-dataflow-common/pom.xml @@ -3,7 +3,7 @@ 4.0.0 spring-cloud-dataflow-common-parent - 2.11.1-SNAPSHOT + 2.11.1 org.springframework.cloud pom @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-dataflow-build - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-build diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml index a7814115db..6a4f41398c 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dataflow-dependencies-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent spring-cloud-dataflow-common-dependencies - 2.11.1-SNAPSHOT + 2.11.1 pom Spring Cloud Dataflow Common Dependencies Spring Cloud Dataflow Common Dependencies diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-flyway/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-flyway/pom.xml index 32f6503739..7b953eac10 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-flyway/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-flyway/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-dataflow-common-parent - 2.11.1-SNAPSHOT + 2.11.1 diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-persistence/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-persistence/pom.xml index 4e41935987..be335381d3 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-persistence/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-persistence/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dataflow-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-parent spring-cloud-dataflow-common-persistence diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker-junit5/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker-junit5/pom.xml index 05ef962b6e..cf50b3999c 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker-junit5/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker-junit5/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-dataflow-common-parent - 2.11.1-SNAPSHOT + 2.11.1 true diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker/pom.xml index 02d67f3035..4df9ce96c7 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-test-docker/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-dataflow-common-parent - 2.11.1-SNAPSHOT + 2.11.1 true diff --git a/spring-cloud-dataflow-completion/pom.xml b/spring-cloud-dataflow-completion/pom.xml index 318a09c52c..f2f85faa6a 100644 --- a/spring-cloud-dataflow-completion/pom.xml +++ b/spring-cloud-dataflow-completion/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-completion diff --git a/spring-cloud-dataflow-composed-task-runner/pom.xml b/spring-cloud-dataflow-composed-task-runner/pom.xml index f72624f94f..c75e89442c 100644 --- a/spring-cloud-dataflow-composed-task-runner/pom.xml +++ b/spring-cloud-dataflow-composed-task-runner/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 org.springframework.cloud spring-cloud-dataflow-composed-task-runner spring-cloud-dataflow-composed-task-runner diff --git a/spring-cloud-dataflow-configuration-metadata/pom.xml b/spring-cloud-dataflow-configuration-metadata/pom.xml index 943b8fa5c9..f5463c0759 100644 --- a/spring-cloud-dataflow-configuration-metadata/pom.xml +++ b/spring-cloud-dataflow-configuration-metadata/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-configuration-metadata diff --git a/spring-cloud-dataflow-container-registry/pom.xml b/spring-cloud-dataflow-container-registry/pom.xml index cdbd9b40f3..8035cd2d81 100644 --- a/spring-cloud-dataflow-container-registry/pom.xml +++ b/spring-cloud-dataflow-container-registry/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-container-registry diff --git a/spring-cloud-dataflow-core-dsl/pom.xml b/spring-cloud-dataflow-core-dsl/pom.xml index 4ee43d8c1d..ddd3a18468 100644 --- a/spring-cloud-dataflow-core-dsl/pom.xml +++ b/spring-cloud-dataflow-core-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-core-dsl diff --git a/spring-cloud-dataflow-core/pom.xml b/spring-cloud-dataflow-core/pom.xml index c34b4e7511..98c0c53ccd 100644 --- a/spring-cloud-dataflow-core/pom.xml +++ b/spring-cloud-dataflow-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-core diff --git a/spring-cloud-dataflow-dependencies/pom.xml b/spring-cloud-dataflow-dependencies/pom.xml index 31e0596747..3e03d7ca1b 100644 --- a/spring-cloud-dataflow-dependencies/pom.xml +++ b/spring-cloud-dataflow-dependencies/pom.xml @@ -4,11 +4,11 @@ spring-cloud-dataflow-dependencies-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent spring-cloud-dataflow-dependencies - 2.11.1-SNAPSHOT + 2.11.1 pom spring-cloud-dataflow-dependencies Spring Cloud Data Flow Dependencies BOM designed to support consumption of Spring Cloud Data Flow from diff --git a/spring-cloud-dataflow-docs/pom.xml b/spring-cloud-dataflow-docs/pom.xml index 8afc7d578d..94ca67ad4f 100644 --- a/spring-cloud-dataflow-docs/pom.xml +++ b/spring-cloud-dataflow-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-docs diff --git a/spring-cloud-dataflow-package/pom.xml b/spring-cloud-dataflow-package/pom.xml index 4fa30745ef..733c7de2f5 100644 --- a/spring-cloud-dataflow-package/pom.xml +++ b/spring-cloud-dataflow-package/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-package diff --git a/spring-cloud-dataflow-parent/pom.xml b/spring-cloud-dataflow-parent/pom.xml index 6d5fe8a816..b1878e2121 100644 --- a/spring-cloud-dataflow-parent/pom.xml +++ b/spring-cloud-dataflow-parent/pom.xml @@ -7,21 +7,21 @@ spring-cloud-dataflow-parent Data Flow Parent - 2.11.1-SNAPSHOT + 2.11.1 pom https://cloud.spring.io/spring-cloud-dataflow/ - 2.11.1-SNAPSHOT + 2.11.1 1.8 -Xdoclint:none 3.3.1 2.7.16 5.3.30 - 3.4.1-SNAPSHOT + 3.4.1 ${dataflow.version} ${dataflow.version} - 2.9.1-SNAPSHOT + 2.9.1 2.4.6 ${dataflow.version} 0.8.8 diff --git a/spring-cloud-dataflow-platform-cloudfoundry/pom.xml b/spring-cloud-dataflow-platform-cloudfoundry/pom.xml index 93942b2a71..f37bff0088 100644 --- a/spring-cloud-dataflow-platform-cloudfoundry/pom.xml +++ b/spring-cloud-dataflow-platform-cloudfoundry/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-platform-cloudfoundry diff --git a/spring-cloud-dataflow-platform-kubernetes/pom.xml b/spring-cloud-dataflow-platform-kubernetes/pom.xml index ca1e6bdef7..3910b980e5 100644 --- a/spring-cloud-dataflow-platform-kubernetes/pom.xml +++ b/spring-cloud-dataflow-platform-kubernetes/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-platform-kubernetes diff --git a/spring-cloud-dataflow-registry/pom.xml b/spring-cloud-dataflow-registry/pom.xml index 05b0087627..ae9a59d4b6 100644 --- a/spring-cloud-dataflow-registry/pom.xml +++ b/spring-cloud-dataflow-registry/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-registry diff --git a/spring-cloud-dataflow-rest-client/pom.xml b/spring-cloud-dataflow-rest-client/pom.xml index fcd897688a..da6f8919d4 100644 --- a/spring-cloud-dataflow-rest-client/pom.xml +++ b/spring-cloud-dataflow-rest-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-rest-client diff --git a/spring-cloud-dataflow-rest-resource/pom.xml b/spring-cloud-dataflow-rest-resource/pom.xml index fa3bf18aca..40b4885a8c 100644 --- a/spring-cloud-dataflow-rest-resource/pom.xml +++ b/spring-cloud-dataflow-rest-resource/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-rest-resource diff --git a/spring-cloud-dataflow-schema-core/pom.xml b/spring-cloud-dataflow-schema-core/pom.xml index 11732265eb..8fe61acbb0 100644 --- a/spring-cloud-dataflow-schema-core/pom.xml +++ b/spring-cloud-dataflow-schema-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-schema-core diff --git a/spring-cloud-dataflow-schema/pom.xml b/spring-cloud-dataflow-schema/pom.xml index 2b75416f76..399ec3f55d 100644 --- a/spring-cloud-dataflow-schema/pom.xml +++ b/spring-cloud-dataflow-schema/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-schema diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml index 5e5a7f918e..0210a663be 100644 --- a/spring-cloud-dataflow-server-core/pom.xml +++ b/spring-cloud-dataflow-server-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-server-core diff --git a/spring-cloud-dataflow-server/pom.xml b/spring-cloud-dataflow-server/pom.xml index 7de7e15ed6..8689d18f69 100644 --- a/spring-cloud-dataflow-server/pom.xml +++ b/spring-cloud-dataflow-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-server diff --git a/spring-cloud-dataflow-shell-core/pom.xml b/spring-cloud-dataflow-shell-core/pom.xml index 19ef8549d2..e2ee53831f 100644 --- a/spring-cloud-dataflow-shell-core/pom.xml +++ b/spring-cloud-dataflow-shell-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-shell-core diff --git a/spring-cloud-dataflow-shell/pom.xml b/spring-cloud-dataflow-shell/pom.xml index 0fb96581eb..7ed0394f53 100644 --- a/spring-cloud-dataflow-shell/pom.xml +++ b/spring-cloud-dataflow-shell/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-shell diff --git a/spring-cloud-dataflow-single-step-batch-job/pom.xml b/spring-cloud-dataflow-single-step-batch-job/pom.xml index 9b0728c146..4c3b13fb90 100644 --- a/spring-cloud-dataflow-single-step-batch-job/pom.xml +++ b/spring-cloud-dataflow-single-step-batch-job/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-single-step-batch-job diff --git a/spring-cloud-dataflow-tasklauncher/pom.xml b/spring-cloud-dataflow-tasklauncher/pom.xml index cdd3a6ce31..3201d548c7 100644 --- a/spring-cloud-dataflow-tasklauncher/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function/pom.xml index 29626f3d07..211182e57c 100644 --- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow-tasklauncher-function diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml index 27060e9c7e..4d045aef02 100644 --- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-dependencies/pom.xml @@ -6,14 +6,14 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher - 2.11.1-SNAPSHOT + 2.11.1 ../ spring-cloud-dataflow-tasklauncher-sink-dependencies pom spring-cloud-dataflow-tasklauncher-sink-dependencies spring-cloud-dataflow-tasklauncher sink application common dependencies - 2.11.1-SNAPSHOT + 2.11.1 org.springframework.cloud diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/pom.xml index 6469e58c26..32f0587999 100644 --- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow-tasklauncher-sink-kafka spring-cloud-dataflow-tasklauncher-sink-kafka spring-cloud-dataflow-tasklauncher sink application with Kafka binder @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher-sink-dependencies - 2.11.1-SNAPSHOT + 2.11.1 pom diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/pom.xml index 5bb5250549..e7faad4bd7 100644 --- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow-tasklauncher-sink-rabbit spring-cloud-dataflow-tasklauncher-sink-rabbit spring-cloud-dataflow-tasklauncher sink application with RabbitMQ binder @@ -24,7 +24,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher-sink-dependencies - 2.11.1-SNAPSHOT + 2.11.1 pom diff --git a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink/pom.xml b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink/pom.xml index 412dd9aa85..bf942a670b 100644 --- a/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink/pom.xml +++ b/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-dataflow-tasklauncher-sink diff --git a/spring-cloud-dataflow-test/pom.xml b/spring-cloud-dataflow-test/pom.xml index e5f71c01f1..eb88f10841 100644 --- a/spring-cloud-dataflow-test/pom.xml +++ b/spring-cloud-dataflow-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-dataflow-test diff --git a/spring-cloud-skipper/pom.xml b/spring-cloud-skipper/pom.xml index bec3de6f6d..6c8b8508b2 100644 --- a/spring-cloud-skipper/pom.xml +++ b/spring-cloud-skipper/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 Spring Cloud Skipper Spring Cloud Skipper pom @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-dataflow-build - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-build @@ -25,7 +25,7 @@ 1.8 2.5.1 - 2.9.1-SNAPSHOT + 2.9.1 1.15 2.0.7.RELEASE diff --git a/spring-cloud-skipper/spring-cloud-skipper-autoconfigure/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-autoconfigure/pom.xml index 66d7c66b9c..2f394f5350 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-autoconfigure/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-autoconfigure/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-client/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-client/pom.xml index 6229d6fc5c..b1b963b6a7 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-client/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-client/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml index f6d298835b..f4ad8b60ff 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - 2.11.1-SNAPSHOT + 2.11.1 spring-cloud-skipper-dependencies pom Spring Cloud Skipper :: Dependencies @@ -10,7 +10,7 @@ spring-cloud-dataflow-dependencies-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent diff --git a/spring-cloud-skipper/spring-cloud-skipper-docs/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-docs/pom.xml index 5ecfed0ab4..30ca7d022f 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-docs/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-platform-cloudfoundry/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-platform-cloudfoundry/pom.xml index a387b8ebed..555aacade0 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-platform-cloudfoundry/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-platform-cloudfoundry/pom.xml @@ -9,7 +9,7 @@ spring-cloud-skipper-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/pom.xml index 65da0ea105..d20076c89f 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-platform-kubernetes/pom.xml @@ -4,7 +4,7 @@ spring-cloud-skipper-parent org.springframework.cloud - 2.11.1-SNAPSHOT + 2.11.1 .. spring-cloud-skipper-platform-kubernetes diff --git a/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml index 9e6226b8a0..1a5ab8e998 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-server-core/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-server/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-server/pom.xml index a23615f2d0..ac1fd0d649 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-server/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-server/pom.xml @@ -6,11 +6,11 @@ jar Spring Cloud Skipper :: Server Spring Cloud Skipper :: Server - 2.11.1-SNAPSHOT + 2.11.1 org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../../spring-cloud-dataflow-parent diff --git a/spring-cloud-skipper/spring-cloud-skipper-shell-commands/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-shell-commands/pom.xml index c05c0ed427..dec7b8fb3a 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-shell-commands/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-shell-commands/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper-shell/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-shell/pom.xml index a313339951..f91fb7d61e 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-shell/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-shell/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-skipper/pom.xml b/spring-cloud-skipper/spring-cloud-skipper/pom.xml index cf4014085f..3fe2c2b475 100644 --- a/spring-cloud-skipper/spring-cloud-skipper/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. diff --git a/spring-cloud-skipper/spring-cloud-starter-skipper-server/pom.xml b/spring-cloud-skipper/spring-cloud-starter-skipper-server/pom.xml index e669d01fe1..6879db1547 100644 --- a/spring-cloud-skipper/spring-cloud-starter-skipper-server/pom.xml +++ b/spring-cloud-skipper/spring-cloud-starter-skipper-server/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-skipper-parent - 2.11.1-SNAPSHOT + 2.11.1 .. spring-cloud-starter-skipper-server diff --git a/spring-cloud-starter-dataflow-server/pom.xml b/spring-cloud-starter-dataflow-server/pom.xml index 1739c222ad..ab437e06ce 100644 --- a/spring-cloud-starter-dataflow-server/pom.xml +++ b/spring-cloud-starter-dataflow-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-starter-dataflow-server diff --git a/spring-cloud-starter-dataflow-ui/pom.xml b/spring-cloud-starter-dataflow-ui/pom.xml index 46d0564885..280bab6e82 100644 --- a/spring-cloud-starter-dataflow-ui/pom.xml +++ b/spring-cloud-starter-dataflow-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.11.1-SNAPSHOT + 2.11.1 ../spring-cloud-dataflow-parent spring-cloud-starter-dataflow-ui diff --git a/src/deploy/versions.yaml b/src/deploy/versions.yaml index 34e39790d8..5389899603 100644 --- a/src/deploy/versions.yaml +++ b/src/deploy/versions.yaml @@ -10,5 +10,5 @@ scdf-type: maintenance-snapshot: '1.5.4-SNAPSHOT' default: scdf-type: 'oss' - version: 'snapshot' - package-version: '2.11.1-SNAPSHOT' + version: 'release' + package-version: '2.11.1' diff --git a/src/docker-compose/.env b/src/docker-compose/.env index 059cfee9b5..753def1e62 100644 --- a/src/docker-compose/.env +++ b/src/docker-compose/.env @@ -1,5 +1,5 @@ -DATAFLOW_VERSION=2.11.1-SNAPSHOT -SKIPPER_VERSION=2.11.1-SNAPSHOT +DATAFLOW_VERSION=2.11.1 +SKIPPER_VERSION=2.11.1 COMPOSE_PROJECT_NAME=scdf COMPOSE_HTTP_TIMEOUT=300 diff --git a/src/docker-compose/docker-compose-dood.yml b/src/docker-compose/docker-compose-dood.yml index 2f6775fdb7..82c61e329f 100644 --- a/src/docker-compose/docker-compose-dood.yml +++ b/src/docker-compose/docker-compose-dood.yml @@ -40,7 +40,7 @@ services: - SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_PORTRANGE_HIGH=61000 # Override the CTR form maven to docker - - SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}${BP_JVM_VERSION:-} + - SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-@project.version@}${BP_JVM_VERSION:-} - SPRING_CLOUD_DATAFLOW_SERVER_URI=${DATAFLOW_URI:-http://dataflow-server:9393} volumes: - /var/run/docker.sock:/var/run/docker.sock @@ -64,8 +64,8 @@ services: command: > /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${STREAM_APPS_URI:-https://dataflow.spring.io/kafka-docker-latest&force=true}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}${BP_JVM_VERSION:-}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${STREAM_APPS_URI:-https://dataflow.spring.io/kafka-docker-latest&force=true}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-@project.version@}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-@project.version@}${BP_JVM_VERSION:-}'; echo 'Docker Stream apps imported'" app-import-task: @@ -73,6 +73,4 @@ services: /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${TASK_APPS_URI:-https://dataflow.spring.io/task-docker-latest&force=true}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/timestamp3' --no-check-certificate --post-data='bootVersion=3&uri=docker:springcloudtask/timestamp-task:3.0.0'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/timestamp-batch3' --no-check-certificate --post-data='bootVersion=3&uri=docker:springcloudtask/timestamp-batch-task:3.0.0'; echo 'Docker Task apps imported'" diff --git a/src/docker-compose/docker-compose-influxdb.yml b/src/docker-compose/docker-compose-influxdb.yml index 47f4779983..4af49c5d4d 100644 --- a/src/docker-compose/docker-compose-influxdb.yml +++ b/src/docker-compose/docker-compose-influxdb.yml @@ -19,13 +19,13 @@ services: } influxdb: - image: influxdb:1.8 + image: influxdb:1.7.7 container_name: influxdb ports: - '8086:8086' grafana: - image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-@project.version@} container_name: grafana ports: - '3000:3000' diff --git a/src/docker-compose/docker-compose-postgres.yml b/src/docker-compose/docker-compose-postgres.yml index c898a2cbba..8b94a95023 100644 --- a/src/docker-compose/docker-compose-postgres.yml +++ b/src/docker-compose/docker-compose-postgres.yml @@ -4,22 +4,22 @@ version: '3' # Usage: docker-compose -f ./docker-compose.yml -f ./docker-compose-postgres.yml up services: + mariadb: + entrypoint: ["echo", "MariaDB service is disabled"] + postgres: image: postgres:14 command: postgres -c 'max_connections=300' container_name: dataflow-postgres restart: always environment: - LANG: en_US.utf8 - LC_ALL: en_US.utf8 - JDK_JAVA_OPTIONS: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' POSTGRES_DB: dataflow POSTGRES_USER: root POSTGRES_PASSWORD: rootpw expose: - 5432 ports: - - '5432:5432' + - 5432:5432 dataflow-server: environment: @@ -27,13 +27,11 @@ services: - SPRING_DATASOURCE_USERNAME=root - SPRING_DATASOURCE_PASSWORD=rootpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - depends_on: - - postgres + skipper-server: environment: - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/dataflow - SPRING_DATASOURCE_USERNAME=root - SPRING_DATASOURCE_PASSWORD=rootpw - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver - depends_on: - - postgres + diff --git a/src/docker-compose/docker-compose-prometheus.yml b/src/docker-compose/docker-compose-prometheus.yml index 05f92ac780..47f91c1559 100644 --- a/src/docker-compose/docker-compose-prometheus.yml +++ b/src/docker-compose/docker-compose-prometheus.yml @@ -38,13 +38,13 @@ services: - micrometer.prometheus-proxy.tcp-port=7001 grafana: - image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-@project.version@} container_name: grafana ports: - '3000:3000' prometheus: - image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-@project.version@} container_name: prometheus ports: - '9090:9090' diff --git a/src/docker-compose/docker-compose-rabbitmq.yml b/src/docker-compose/docker-compose-rabbitmq.yml index 34eca07681..463fb41701 100644 --- a/src/docker-compose/docker-compose-rabbitmq.yml +++ b/src/docker-compose/docker-compose-rabbitmq.yml @@ -4,34 +4,29 @@ version: '3' # Usage: docker-compose -f ./docker-compose.yml -f ./docker-compose-rabbitmq.yml up services: + kafka-broker: + entrypoint: ["echo", "kafka-broker service is disabled"] + + zookeeper: + entrypoint: ["echo", "zookeeper service is disabled"] + rabbitmq: - image: rabbitmq:3.8-management + image: rabbitmq:3.7 container_name: dataflow-rabbitmq - environment: - LANG: en_US.utf8 - LC_ALL: en_US.utf8 - JDK_JAVA_OPTIONS: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' expose: - '5672' - - '15672' dataflow-server: environment: - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_RABBITMQ_HOST=rabbitmq - depends_on: - - rabbitmq - - skipper-server: - environment: - - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_RABBITMQ_HOST=rabbitmq - depends_on: - - rabbitmq app-import-stream: command: > /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${STREAM_APPS_URI:-https://dataflow.spring.io/rabbitmq-maven-latest&force=true}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/ver-log/3.0.1' --no-check-certificate --post-data='uri=maven://org.springframework.cloud.stream.app:log-sink-rabbit:3.0.1'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/ver-log/2.1.5.RELEASE' --no-check-certificate --post-data='uri=maven://org.springframework.cloud.stream.app:log-sink-rabbit:2.1.5.RELEASE'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-@project.version@}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-@project.version@}'; echo 'Stream apps imported'" diff --git a/src/docker-compose/docker-compose-zipkin.yml b/src/docker-compose/docker-compose-zipkin.yml index 242c1fa3ae..977ad645e9 100644 --- a/src/docker-compose/docker-compose-zipkin.yml +++ b/src/docker-compose/docker-compose-zipkin.yml @@ -6,7 +6,7 @@ version: '3' services: zipkin-server: - image: openzipkin/zipkin:2 + image: openzipkin/zipkin:2.23.2 container_name: zipkin-server expose: - '9411' diff --git a/src/docker-compose/docker-compose.yml b/src/docker-compose/docker-compose.yml index b33bf9dc01..cd7f9bd01b 100644 --- a/src/docker-compose/docker-compose.yml +++ b/src/docker-compose/docker-compose.yml @@ -1,4 +1,5 @@ version: '3' + # Configuration environment variables: # - DATAFLOW_VERSION and SKIPPER_VERSION specify what DataFlow and Skipper image versions to use. # - STREAM_APPS_URI and TASK_APPS_URI are used to specify what Stream and Task applications to pre-register. @@ -19,25 +20,66 @@ version: '3' # The deployed stream applications that run in their own docker containers (e.g. docker:// registered apps), # can be reached on the ports they expose. services: + mariadb: + image: mariadb:10.6 + container_name: dataflow-mariadb + environment: + MARIADB_DATABASE: dataflow + MARIADB_ROOT_PASSWORD: rootpw + expose: + - 3306 + + kafka-broker: + image: confluentinc/cp-kafka:5.5.2 + container_name: dataflow-kafka + expose: + - "9092" + environment: + - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka-broker:9092 + - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 + - KAFKA_ADVERTISED_HOST_NAME=kafka-broker + - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 + - KAFKA_LOG4J_ROOT_LOGLEVEL=ERROR + - KAFKA_LOG4J_LOGGERS=org.apache.zookeeper=ERROR,org.apache.kafka=ERROR,kafka=ERROR,kafka.cluster=ERROR,kafka.controller=ERROR,kafka.coordinator=ERROR,kafka.log=ERROR,kafka.server=ERROR,kafka.zookeeper=ERROR,state.change.logger=ERROR + depends_on: + - zookeeper + + zookeeper: + image: confluentinc/cp-zookeeper:5.5.2 + container_name: dataflow-kafka-zookeeper + expose: + - "2181" + environment: + - ZOOKEEPER_CLIENT_PORT=2181 + dataflow-server: user: root - image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.11.1-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-@project.version@}${BP_JVM_VERSION:-} container_name: dataflow-server ports: - "9393:9393" environment: - - LANG=en_US.utf8 - - LC_ALL=en_US.utf8 - - JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 + - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=PLAINTEXT://kafka-broker:9092 + - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_CLOUD_STREAM_KAFKA_STREAMS_BINDER_BROKERS=PLAINTEXT://kafka-broker:9092 + - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_CLOUD_STREAM_KAFKA_BINDER_ZKNODES=zookeeper:2181 + - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_CLOUD_STREAM_KAFKA_STREAMS_BINDER_ZKNODES=zookeeper:2181 + - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_KAFKA_STREAMS_PROPERTIES_METRICS_RECORDING_LEVEL=DEBUG # Set CLOSECONTEXTENABLED=true to ensure that the CRT launcher is closed. - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_TASK_SPRING_CLOUD_TASK_CLOSECONTEXTENABLED=true - SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI=${SKIPPER_URI:-http://skipper-server:7577}/api + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/dataflow + - SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.MariaDB106Dialect + - SPRING_DATASOURCE_USERNAME=root + - SPRING_DATASOURCE_PASSWORD=rootpw + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver # (Optionally) authenticate the default Docker Hub access for the App Metadata access. - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_USER=${METADATA_DEFAULT_DOCKERHUB_USER} - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRY_CONFIGURATIONS_DEFAULT_SECRET=${METADATA_DEFAULT_DOCKERHUB_PASSWORD} + - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRYCONFIGURATIONS_DEFAULT_USER=${METADATA_DEFAULT_DOCKERHUB_USER} - SPRING_CLOUD_DATAFLOW_CONTAINER_REGISTRYCONFIGURATIONS_DEFAULT_SECRET=${METADATA_DEFAULT_DOCKERHUB_PASSWORD} depends_on: + - kafka-broker - skipper-server restart: always volumes: @@ -48,6 +90,12 @@ services: container_name: dataflow-app-import-stream depends_on: - dataflow-server + command: > + /bin/sh -c " + ./wait-for-it.sh -t 360 dataflow-server:9393; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${STREAM_APPS_URI:-https://dataflow.spring.io/kafka-maven-latest&force=true}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-@project.version@}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-@project.version@}'; + echo 'Maven Stream apps imported'" app-import-task: image: springcloud/baseimage:1.0.4 @@ -58,24 +106,23 @@ services: /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps' --no-check-certificate --post-data='uri=${TASK_APPS_URI:-https://dataflow.spring.io/task-maven-latest&force=true}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/timestamp3' --no-check-certificate --post-data='bootVersion=3&uri=maven://uri=maven:io.spring:timestamp-task:3.0.0'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/timestamp-batch3' --no-check-certificate --post-data='bootVersion=3&uri=maven://uri=maven:io.spring:timestamp-batch:3.0.0'; echo 'Maven Task apps imported'" skipper-server: user: root - image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.11.1-SNAPSHOT}${BP_JVM_VERSION:-} - container_name: skipper-server + image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-@spring-cloud-skipper.version@}${BP_JVM_VERSION:-} + container_name: skipper ports: - "7577:7577" - ${APPS_PORT_RANGE:-20000-20195:20000-20195} environment: - - LANG=en_US.utf8 - - LC_ALL=en_US.utf8 - - JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 - - SERVER_PORT=7577 - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_LOW=20000 - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_PORTRANGE_HIGH=20190 + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/dataflow + - SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.MariaDB106Dialect + - SPRING_DATASOURCE_USERNAME=root + - SPRING_DATASOURCE_PASSWORD=rootpw + - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_SKIPPER_SERVER_DEPLOYER=ERROR restart: always volumes: diff --git a/src/kubernetes/grafana/grafana-deployment.yaml b/src/kubernetes/grafana/grafana-deployment.yaml index 06af3e1417..8760892857 100644 --- a/src/kubernetes/grafana/grafana-deployment.yaml +++ b/src/kubernetes/grafana/grafana-deployment.yaml @@ -14,7 +14,7 @@ spec: app: grafana spec: containers: - - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.11.1-SNAPSHOT + - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.11.1 name: grafana env: - name: GF_SECURITY_ADMIN_USER diff --git a/src/kubernetes/kafka/kafka-deployment.yaml b/src/kubernetes/kafka/kafka-deployment.yaml index d9a5d59c68..494ab7ab28 100644 --- a/src/kubernetes/kafka/kafka-deployment.yaml +++ b/src/kubernetes/kafka/kafka-deployment.yaml @@ -20,7 +20,6 @@ spec: containers: - name: kafka image: confluentinc/cp-kafka:5.5.2 - imagePullPolicy: IfNotPresent ports: - containerPort: 9092 env: @@ -31,9 +30,9 @@ spec: - name: JDK_JAVA_OPTIONS value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' - name: KAFKA_ADVERTISED_LISTENERS - value: "PLAINTEXT://kafka-broker.kafka:9092" + value: "PLAINTEXT://kafka-broker:9092" - name: KAFKA_ZOOKEEPER_CONNECT - value: kafka-zk.kafka:2181 + value: kafka-zk:2181 - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR value: "1" - name: KAFKA_LOG4J_ROOT_LOGLEVEL diff --git a/src/kubernetes/kafka/kafka-svc.yaml b/src/kubernetes/kafka/kafka-svc.yaml index a9d49f53e6..2dff6fd469 100644 --- a/src/kubernetes/kafka/kafka-svc.yaml +++ b/src/kubernetes/kafka/kafka-svc.yaml @@ -6,6 +6,7 @@ metadata: app: kafka component: kafka-broker spec: + clusterIP: None ports: - port: 9092 name: kafka-port diff --git a/src/kubernetes/kafka/kafka-zk-deployment.yaml b/src/kubernetes/kafka/kafka-zk-deployment.yaml index c1b7011e17..ba39b30068 100644 --- a/src/kubernetes/kafka/kafka-zk-deployment.yaml +++ b/src/kubernetes/kafka/kafka-zk-deployment.yaml @@ -19,7 +19,6 @@ spec: containers: - name: kafka-zk image: confluentinc/cp-zookeeper:5.5.2 - imagePullPolicy: IfNotPresent ports: - containerPort: 2181 env: diff --git a/src/kubernetes/mariadb/mariadb-deployment.yaml b/src/kubernetes/mariadb/mariadb-deployment.yaml index c4362d6771..2bd2c02c1f 100644 --- a/src/kubernetes/mariadb/mariadb-deployment.yaml +++ b/src/kubernetes/mariadb/mariadb-deployment.yaml @@ -16,16 +16,17 @@ spec: spec: containers: - image: mariadb:10.4 - imagePullPolicy: IfNotPresent name: mariadb env: + - name: LANG + value: en_US.utf8 + - name: LC_ALL + value: en_US.utf8 - name: MARIADB_ROOT_PASSWORD valueFrom: secretKeyRef: key: database-password name: mariadb - - name: MARIADB_DATABASE - value: 'dataflow' ports: - containerPort: 3306 name: mariadb diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-clusterrolebinding.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-clusterrolebinding.yaml index c1b2ca8d16..22d533119f 100644 --- a/src/kubernetes/prometheus-proxy/prometheus-proxy-clusterrolebinding.yaml +++ b/src/kubernetes/prometheus-proxy/prometheus-proxy-clusterrolebinding.yaml @@ -7,7 +7,7 @@ metadata: subjects: - kind: ServiceAccount name: prometheus-rsocket-proxy - namespace: scdf + namespace: default roleRef: kind: ClusterRole name: cluster-admin diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml index 3494e71009..034af0ca0b 100644 --- a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml +++ b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml @@ -31,9 +31,6 @@ spec: requests: cpu: 0.5 memory: 1024Mi - env: - - name: LOGGING_LEVEL_IO_MICROMETER - value: DEBUG securityContext: fsGroup: 2000 runAsNonRoot: true diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-serviceaccount.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-serviceaccount.yaml index 361b67a487..17054812f4 100644 --- a/src/kubernetes/prometheus-proxy/prometheus-proxy-serviceaccount.yaml +++ b/src/kubernetes/prometheus-proxy/prometheus-proxy-serviceaccount.yaml @@ -4,4 +4,4 @@ metadata: name: prometheus-rsocket-proxy labels: app: prometheus-rsocket-proxy - + namespace: default diff --git a/src/kubernetes/prometheus/prometheus-clusterrolebinding.yaml b/src/kubernetes/prometheus/prometheus-clusterrolebinding.yaml index d87ad5aefb..f688957878 100644 --- a/src/kubernetes/prometheus/prometheus-clusterrolebinding.yaml +++ b/src/kubernetes/prometheus/prometheus-clusterrolebinding.yaml @@ -11,4 +11,4 @@ roleRef: subjects: - kind: ServiceAccount name: prometheus - + namespace: default diff --git a/src/kubernetes/prometheus/prometheus-configmap.yaml b/src/kubernetes/prometheus/prometheus-configmap.yaml index e02dbcb8e6..90aef964d0 100644 --- a/src/kubernetes/prometheus/prometheus-configmap.yaml +++ b/src/kubernetes/prometheus/prometheus-configmap.yaml @@ -7,26 +7,41 @@ metadata: data: prometheus.yml: |- global: - scrape_interval: 5s # Set the scrape interval to every 15 seconds. Default is every 1 minute. - evaluation_interval: 5s # Evaluate rules every 15 seconds. The default is every 1 minute. + scrape_interval: 10s + scrape_timeout: 9s + evaluation_interval: 10s + scrape_configs: - - job_name: 'scdf' - metrics_path: '/actuator/prometheus' - file_sd_configs: - - files: - - /etc/prometheus/targets.json - refresh_interval: 30s - - - job_name: 'local-rsocket-proxy' - scrape_interval: 10s - scrape_timeout: 9s - metrics_path: '/metrics/proxy' - static_configs: - - targets: ['prometheus-rsocket-proxy:8080'] - - - job_name: 'local-rsocket-connected' - scrape_interval: 10s - scrape_timeout: 9s - metrics_path: '/metrics/connected' - static_configs: - - targets: ['prometheus-rsocket-proxy:8080'] + - job_name: 'proxied-applications' + metrics_path: '/metrics/connected' + kubernetes_sd_configs: + - role: pod + namespaces: + names: + - default + relabel_configs: + - source_labels: [__meta_kubernetes_pod_label_app] + action: keep + regex: prometheus-rsocket-proxy + - source_labels: [__meta_kubernetes_pod_container_port_number] + action: keep + regex: 8080 + - job_name: 'proxies' + metrics_path: '/metrics/proxy' + kubernetes_sd_configs: + - role: pod + namespaces: + names: + - default + relabel_configs: + - source_labels: [__meta_kubernetes_pod_label_app] + action: keep + regex: prometheus-rsocket-proxy + - source_labels: [__meta_kubernetes_pod_container_port_number] + action: keep + regex: 8080 + - action: labelmap + regex: __meta_kubernetes_pod_label_(.+) + - source_labels: [__meta_kubernetes_pod_name] + action: replace + target_label: kubernetes_pod_name diff --git a/src/kubernetes/prometheus/prometheus-deployment.yaml b/src/kubernetes/prometheus/prometheus-deployment.yaml index 8b121610ac..be827795f2 100644 --- a/src/kubernetes/prometheus/prometheus-deployment.yaml +++ b/src/kubernetes/prometheus/prometheus-deployment.yaml @@ -16,11 +16,8 @@ spec: serviceAccountName: prometheus containers: - name: prometheus - image: prom/prometheus:v2.37.8 - imagePullPolicy: IfNotPresent + image: prom/prometheus:v2.12.0 args: - - "--web.console.libraries=/usr/share/prometheus/console_libraries" - - "--web.console.templates=/usr/share/prometheus/consoles" - "--config.file=/etc/prometheus/prometheus.yml" - "--storage.tsdb.path=/prometheus/" - "--web.enable-lifecycle" diff --git a/src/kubernetes/prometheus/prometheus-serviceaccount.yaml b/src/kubernetes/prometheus/prometheus-serviceaccount.yaml index 744a293f94..e5dd524cf4 100644 --- a/src/kubernetes/prometheus/prometheus-serviceaccount.yaml +++ b/src/kubernetes/prometheus/prometheus-serviceaccount.yaml @@ -4,4 +4,4 @@ metadata: name: prometheus labels: app: prometheus - + namespace: default diff --git a/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml b/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml index 263f00fda5..f2f3c7ae8d 100644 --- a/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml +++ b/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml @@ -15,16 +15,12 @@ spec: app: rabbitmq spec: containers: - - image: rabbitmq:3.8-management - name: rabbitmq - imagePullPolicy: IfNotPresent - env: - - name: LANG - value: en_US.utf8 - - name: LC_ALL - value: en_US.utf8 - - name: JDK_JAVA_OPTIONS - value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' - ports: - - containerPort: 5672 - - containerPort: 15672 + - image: rabbitmq:3.6.10 + name: rabbitmq + env: + - name: LANG + value: en_US.utf8 + - name: LC_ALL + value: en_US.utf8 + ports: + - containerPort: 5672 diff --git a/src/kubernetes/rabbitmq/rabbitmq-svc.yaml b/src/kubernetes/rabbitmq/rabbitmq-svc.yaml index d7cd67cd02..2f88e87ae9 100644 --- a/src/kubernetes/rabbitmq/rabbitmq-svc.yaml +++ b/src/kubernetes/rabbitmq/rabbitmq-svc.yaml @@ -5,11 +5,7 @@ metadata: labels: app: rabbitmq spec: + ports: + - port: 5672 selector: app: rabbitmq - type: LoadBalancer - ports: - - name: amqp - port: 5672 - - name: management - port: 15672 diff --git a/src/kubernetes/server/server-config.yaml b/src/kubernetes/server/server-config.yaml index 2f31f2243c..c197e5faef 100644 --- a/src/kubernetes/server/server-config.yaml +++ b/src/kubernetes/server/server-config.yaml @@ -23,10 +23,8 @@ data: task: platform: kubernetes: - accounts: + accounts: default: - fabric8: - limits: memory: 1024Mi datasource: @@ -36,4 +34,4 @@ data: driverClassName: org.mariadb.jdbc.Driver testOnBorrow: true validationQuery: "SELECT 1" - + diff --git a/src/kubernetes/server/server-deployment.yaml b/src/kubernetes/server/server-deployment.yaml index d6192e4d9e..0d9775e181 100644 --- a/src/kubernetes/server/server-deployment.yaml +++ b/src/kubernetes/server/server-deployment.yaml @@ -16,8 +16,8 @@ spec: spec: containers: - name: scdf-server - image: springcloud/spring-cloud-dataflow-server:2.11.1-SNAPSHOT - imagePullPolicy: Always + image: springcloud/spring-cloud-dataflow-server:2.11.1 + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config @@ -26,60 +26,56 @@ spec: mountPath: /etc/secrets/database readOnly: true ports: - - containerPort: 9393 + - containerPort: 8080 livenessProbe: httpGet: path: /management/health - port: 9393 + port: 8080 initialDelaySeconds: 45 readinessProbe: httpGet: path: /management/info - port: 9393 + port: 8080 initialDelaySeconds: 45 - startupProbe: - tcpSocket: - port: 9393 - initialDelaySeconds: 15 - periodSeconds: 3 - failureThreshold: 120 - timeoutSeconds: 3 resources: - requests: + limits: cpu: 1.0 memory: 2048Mi + requests: + cpu: 0.5 + memory: 1024Mi env: - - name: LANG - value: 'en_US.utf8' - - name: LC_ALL - value: 'en_US.utf8' - - name: JDK_JAVA_OPTIONS - value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' - - name: KUBERNETES_NAMESPACE - valueFrom: - fieldRef: - fieldPath: "metadata.namespace" - - name: SERVER_PORT - value: '9393' - - name: SPRING_CLOUD_CONFIG_ENABLED - value: 'false' - - name: SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED - value: 'true' - - name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED - value: 'true' - - name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI - value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.11.1-SNAPSHOT' - - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API - value: 'false' - - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API - value: 'false' - - name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS - value: /etc/secrets - - name: SPRING_CLOUD_DATAFLOW_SERVER_URI - value: 'http://${SCDF_SERVER_SERVICE_HOST}:${SCDF_SERVER_SERVICE_PORT}' - # Provide the Skipper service location - - name: SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI - value: 'http://${SKIPPER_SERVICE_HOST}:${SKIPPER_SERVICE_PORT}/api' + - name: LANG + value: en_US.utf8 + - name: LC_ALL + value: en_US.utf8 + - name: JDK_JAVA_OPTIONS + value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' + - name: KUBERNETES_NAMESPACE + valueFrom: + fieldRef: + fieldPath: "metadata.namespace" + - name: SERVER_PORT + value: '8080' + - name: SPRING_CLOUD_CONFIG_ENABLED + value: 'false' + - name: SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED + value: 'true' + - name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED + value: 'true' + - name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI + value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:@ctr.version@' + - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API + value: 'false' + - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API + value: 'false' + - name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS + value: /etc/secrets + - name: SPRING_CLOUD_DATAFLOW_SERVER_URI + value: 'http://${SCDF_SERVER_SERVICE_HOST}:${SCDF_SERVER_SERVICE_PORT}' + # Provide the Skipper service location + - name: SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI + value: 'http://${SKIPPER_SERVICE_HOST}:${SKIPPER_SERVICE_PORT}/api' initContainers: - name: init-mariadb-wait image: busybox:1 diff --git a/src/kubernetes/server/server-svc.yaml b/src/kubernetes/server/server-svc.yaml index eba7dca312..41745d8f64 100644 --- a/src/kubernetes/server/server-svc.yaml +++ b/src/kubernetes/server/server-svc.yaml @@ -10,7 +10,7 @@ spec: type: LoadBalancer ports: - port: 80 - targetPort: 9393 + targetPort: 8080 name: scdf-server selector: app: scdf-server diff --git a/src/kubernetes/skipper/skipper-config-kafka.yaml b/src/kubernetes/skipper/skipper-config-kafka.yaml index d957934a26..bceb6a2858 100644 --- a/src/kubernetes/skipper/skipper-config-kafka.yaml +++ b/src/kubernetes/skipper/skipper-config-kafka.yaml @@ -16,15 +16,9 @@ data: default: environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=kafka-broker:9092,SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${KAFKA_ZK_SERVICE_HOST}:${KAFKA_ZK_SERVICE_PORT}' limits: - memory: 2g - cpu: 2.0 - readinessProbeDelay: 1 - readinessProbeTimeout: 5 - livenessProbeDelay: 1 - livenessProbeTimeout: 2 - startupProbeDelay: 20 - startupProbeTimeout: 5 - startupProbeFailure: 50 + memory: 1024Mi + cpu: 500m + startupProbeFailures: 30 datasource: url: jdbc:mariadb://${MARIADB_SERVICE_HOST}:${MARIADB_SERVICE_PORT}/skipper username: root diff --git a/src/kubernetes/skipper/skipper-config-rabbit.yaml b/src/kubernetes/skipper/skipper-config-rabbit.yaml index e67809649f..59b9da0f0a 100644 --- a/src/kubernetes/skipper/skipper-config-rabbit.yaml +++ b/src/kubernetes/skipper/skipper-config-rabbit.yaml @@ -16,15 +16,10 @@ data: default: environmentVariables: 'SPRING_RABBITMQ_HOST=${RABBITMQ_SERVICE_HOST},SPRING_RABBITMQ_PORT=${RABBITMQ_SERVICE_PORT}' limits: - memory: 2g - cpu: 2.0 - readinessProbeDelay: 1 - readinessProbeTimeout: 5 - livenessProbeDelay: 1 - livenessProbeTimeout: 2 - startupProbeDelay: 20 - startupProbeTimeout: 5 - startupProbeFailure: 50 + memory: 1024Mi + cpu: 500m + readinessProbeDelay: 120 + livenessProbeDelay: 90 datasource: url: jdbc:mariadb://${MARIADB_SERVICE_HOST}:${MARIADB_SERVICE_PORT}/skipper username: root diff --git a/src/kubernetes/skipper/skipper-deployment.yaml b/src/kubernetes/skipper/skipper-deployment.yaml index d195c17a0c..fa1ee91fa5 100644 --- a/src/kubernetes/skipper/skipper-deployment.yaml +++ b/src/kubernetes/skipper/skipper-deployment.yaml @@ -16,8 +16,8 @@ spec: spec: containers: - name: skipper - image: springcloud/spring-cloud-skipper-server:2.11.1-SNAPSHOT - imagePullPolicy: Always + image: springcloud/spring-cloud-skipper-server:2.11.1 + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config @@ -44,31 +44,32 @@ spec: startupProbe: tcpSocket: port: 7577 - initialDelaySeconds: 15 + initialDelaySeconds: 30 periodSeconds: 3 - failureThreshold: 120 + failureThreshold: 20 timeoutSeconds: 3 resources: - requests: + limits: cpu: 1.0 memory: 1024Mi + requests: + cpu: 0.5 + memory: 640Mi env: - - name: LANG - value: 'en_US.utf8' - - name: LC_ALL - value: 'en_US.utf8' - - name: JDK_JAVA_OPTIONS - value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' - - name: SERVER_PORT - value: '7577' - - name: SPRING_CLOUD_CONFIG_ENABLED - value: 'false' - - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API - value: 'false' - - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API - value: 'false' - - name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS - value: /etc/secrets + - name: LANG + value: en_US.utf8 + - name: LC_ALL + value: en_US.utf8 + - name: JDK_JAVA_OPTIONS + value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8' + - name: SPRING_CLOUD_CONFIG_ENABLED + value: 'false' + - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API + value: 'false' + - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API + value: 'false' + - name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS + value: /etc/secrets initContainers: - name: init-mariadb-wait image: busybox:1