diff --git a/pom.xml b/pom.xml index f90c02a1fe..4da72be23b 100644 --- a/pom.xml +++ b/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-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 pom https://cloud.spring.io/spring-cloud-dataflow/ @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-dataflow-build - 2.10.2-SNAPSHOT + 2.10.2 @@ -56,19 +56,19 @@ 1.8 -Xdoclint:none - 3.3.2-SNAPSHOT + 3.3.2 ${project.version} - 2.10.2-SNAPSHOT - 2.8.2-SNAPSHOT - 2.8.2-SNAPSHOT - 2.8.2-SNAPSHOT - 2.8.2-SNAPSHOT + 2.10.2 + 2.8.2 + 2.8.2 + 2.8.2 + 2.8.2 - 2.9.2-SNAPSHOT + 2.9.2 2.4.5 - 1.8.2-SNAPSHOT + 1.8.2 0.8.8 3.0.2 @@ -145,7 +145,7 @@ org.springframework.cloud spring-cloud-dataflow-dependencies - 2.10.2-SNAPSHOT + 2.10.2 pom import diff --git a/spring-cloud-dataflow-audit/pom.xml b/spring-cloud-dataflow-audit/pom.xml index 6fb87f7987..f1490d702a 100644 --- a/spring-cloud-dataflow-audit/pom.xml +++ b/spring-cloud-dataflow-audit/pom.xml @@ -4,7 +4,7 @@ spring-cloud-dataflow-parent org.springframework.cloud - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-audit jar diff --git a/spring-cloud-dataflow-autoconfigure/pom.xml b/spring-cloud-dataflow-autoconfigure/pom.xml index ccad912508..0eac311cfe 100644 --- a/spring-cloud-dataflow-autoconfigure/pom.xml +++ b/spring-cloud-dataflow-autoconfigure/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-autoconfigure jar diff --git a/spring-cloud-dataflow-classic-docs/pom.xml b/spring-cloud-dataflow-classic-docs/pom.xml index 9183fce5b9..337bbd5341 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-classic-docs Spring Cloud Data Flow Docs for Classic mode diff --git a/spring-cloud-dataflow-completion/pom.xml b/spring-cloud-dataflow-completion/pom.xml index ef673facba..a11ea0a3f6 100644 --- a/spring-cloud-dataflow-completion/pom.xml +++ b/spring-cloud-dataflow-completion/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 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 061919412d..f12abb73e3 100644 --- a/spring-cloud-dataflow-composed-task-runner/pom.xml +++ b/spring-cloud-dataflow-composed-task-runner/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-composed-task-runner jar diff --git a/spring-cloud-dataflow-configuration-metadata/pom.xml b/spring-cloud-dataflow-configuration-metadata/pom.xml index 642a81a9af..e0fd6fcce2 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-configuration-metadata diff --git a/spring-cloud-dataflow-container-registry/pom.xml b/spring-cloud-dataflow-container-registry/pom.xml index feaae40d5f..b7e08eabea 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-container-registry diff --git a/spring-cloud-dataflow-core-dsl/pom.xml b/spring-cloud-dataflow-core-dsl/pom.xml index a153613586..1bcab6aa4e 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-core-dsl jar diff --git a/spring-cloud-dataflow-core/pom.xml b/spring-cloud-dataflow-core/pom.xml index a108bc0828..7b7e661f79 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-core jar diff --git a/spring-cloud-dataflow-dependencies/pom.xml b/spring-cloud-dataflow-dependencies/pom.xml index 21f8c03620..160ed739cc 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-dependencies - 2.10.2-SNAPSHOT + 2.10.2 pom spring-cloud-dataflow-dependencies Spring Cloud Data Flow Dependencies BOM designed to support consumption of Spring Cloud Data Flow from @@ -19,108 +19,108 @@ org.springframework.cloud spring-cloud-dataflow-shell - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-shell-core - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-completion - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-core-dsl - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-core - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-rest-client - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-configuration-metadata - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-rest-resource - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-registry - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-container-registry - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-composed-task-runner - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-server-core - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-server - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-autoconfigure - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-starter-dataflow-server - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-starter-dataflow-ui - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-starter-dataflow-server - 2.10.2-SNAPSHOT + 2.10.2 test-jar org.springframework.cloud spring-cloud-dataflow-audit - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-platform-kubernetes - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-platform-cloudfoundry - 2.10.2-SNAPSHOT + 2.10.2 org.springframework.cloud spring-cloud-dataflow-test - 2.10.2-SNAPSHOT + 2.10.2 diff --git a/spring-cloud-dataflow-docs/pom.xml b/spring-cloud-dataflow-docs/pom.xml index f65eb605ba..bf895106ce 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-docs Spring Cloud Data Flow Docs diff --git a/spring-cloud-dataflow-platform-cloudfoundry/pom.xml b/spring-cloud-dataflow-platform-cloudfoundry/pom.xml index 2360f9875b..c7f216af01 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-platform-cloudfoundry jar diff --git a/spring-cloud-dataflow-platform-kubernetes/pom.xml b/spring-cloud-dataflow-platform-kubernetes/pom.xml index cd5dfb5de5..03f6dbe83b 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-platform-kubernetes jar diff --git a/spring-cloud-dataflow-registry/pom.xml b/spring-cloud-dataflow-registry/pom.xml index 73bd01788b..c052a9f39f 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-registry spring-cloud-dataflow-registry diff --git a/spring-cloud-dataflow-rest-client/pom.xml b/spring-cloud-dataflow-rest-client/pom.xml index 39d5e15f04..7a63cfd8a5 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-rest-client jar diff --git a/spring-cloud-dataflow-rest-resource/pom.xml b/spring-cloud-dataflow-rest-resource/pom.xml index f213eeb004..4f8d207e85 100644 --- a/spring-cloud-dataflow-rest-resource/pom.xml +++ b/spring-cloud-dataflow-rest-resource/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-rest-resource jar diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml index 5895b2500f..d4a89a0684 100644 --- a/spring-cloud-dataflow-server-core/pom.xml +++ b/spring-cloud-dataflow-server-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-server-core jar diff --git a/spring-cloud-dataflow-server/pom.xml b/spring-cloud-dataflow-server/pom.xml index 0697d20016..aad2bbbf57 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-server jar diff --git a/spring-cloud-dataflow-shell-core/pom.xml b/spring-cloud-dataflow-shell-core/pom.xml index b7f4ceb5bc..f8c7f17f3b 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-shell-core jar diff --git a/spring-cloud-dataflow-shell/pom.xml b/spring-cloud-dataflow-shell/pom.xml index 60bdf9b914..92c225770c 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-shell jar diff --git a/spring-cloud-dataflow-single-step-batch-job/pom.xml b/spring-cloud-dataflow-single-step-batch-job/pom.xml index cc87709260..b0aa480f40 100644 --- a/spring-cloud-dataflow-single-step-batch-job/pom.xml +++ b/spring-cloud-dataflow-single-step-batch-job/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-single-step-batch-job jar diff --git a/spring-cloud-dataflow-tasklauncher/pom.xml b/spring-cloud-dataflow-tasklauncher/pom.xml index df1c6dc7f6..de9636778b 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-tasklauncher 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 6611d66d04..6fc49ee863 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.10.2-SNAPSHOT + 2.10.2 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 28119c98a1..e3b9b9056f 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,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-tasklauncher-sink-dependencies 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 fa8a579275..425e20cbaa 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,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher-sink-dependencies - 2.10.2-SNAPSHOT + 2.10.2 ../spring-cloud-dataflow-tasklauncher-sink-dependencies 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 bee785a9aa..48cad722ce 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,7 +6,7 @@ org.springframework.cloud spring-cloud-dataflow-tasklauncher-sink-dependencies - 2.10.2-SNAPSHOT + 2.10.2 ../spring-cloud-dataflow-tasklauncher-sink-dependencies 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 5c946bf21d..e494dc6f8c 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-tasklauncher-sink diff --git a/spring-cloud-dataflow-test/pom.xml b/spring-cloud-dataflow-test/pom.xml index c91ccb3618..74d4f3c5c7 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-dataflow-test jar diff --git a/spring-cloud-starter-dataflow-server/pom.xml b/spring-cloud-starter-dataflow-server/pom.xml index 6ec71415db..7dfb5a1390 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.10.2-SNAPSHOT + 2.10.2 spring-cloud-starter-dataflow-server Data Flow Server Starter diff --git a/spring-cloud-starter-dataflow-ui/pom.xml b/spring-cloud-starter-dataflow-ui/pom.xml index 11a2ac9fe0..fdf081c063 100644 --- a/spring-cloud-starter-dataflow-ui/pom.xml +++ b/spring-cloud-starter-dataflow-ui/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.10.2-SNAPSHOT + 2.10.2 spring-cloud-starter-dataflow-ui Data Flow UI Starter diff --git a/src/docker-compose/.env b/src/docker-compose/.env index 02ebd500da..bf356ce580 100644 --- a/src/docker-compose/.env +++ b/src/docker-compose/.env @@ -1,5 +1,5 @@ -DATAFLOW_VERSION=2.10.2-SNAPSHOT -SKIPPER_VERSION=2.9.2-SNAPSHOT +DATAFLOW_VERSION=2.10.2 +SKIPPER_VERSION=2.9.2 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 02c873c1fb..20a9decdc9 100644 --- a/src/docker-compose/docker-compose-dood.yml +++ b/src/docker-compose/docker-compose-dood.yml @@ -40,10 +40,10 @@ 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.10.2-SNAPSHOT}${BP_JVM_VERSION:-} + - SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.10.2}${BP_JVM_VERSION:-} - SPRING_CLOUD_DATAFLOW_SERVER_URI=${DATAFLOW_URI:-http://dataflow-server:9393} entrypoint: > - /bin/sh -c " + bin/sh -c " apt-get update && apt-get install --no-install-recommends -y wget && wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz && tar -xvf /tmp/docker-latest.tgz --directory /tmp/ && @@ -65,7 +65,7 @@ services: - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_PORTRANGE_LOW=20200 - SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_PORTRANGE_HIGH=61000 entrypoint: > - /bin/sh -c " + bin/sh -c " apt-get update && apt-get install --no-install-recommends -y wget && wget --no-check-certificate -P /tmp/ https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz && tar -xvf /tmp/docker-latest.tgz --directory /tmp/ && @@ -85,7 +85,7 @@ services: 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/ver-log/3.0.1' --no-check-certificate --post-data='uri=docker:springcloudstream/log-sink-kafka: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=docker:springcloudstream/log-sink-kafka:2.1.5.RELEASE'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.10.2-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT}${BP_JVM_VERSION:-}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.10.2}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.10.2}${BP_JVM_VERSION:-}'; echo 'Docker Stream apps imported'" app-import-task: diff --git a/src/docker-compose/docker-compose-influxdb.yml b/src/docker-compose/docker-compose-influxdb.yml index b67a6be861..b47626db83 100644 --- a/src/docker-compose/docker-compose-influxdb.yml +++ b/src/docker-compose/docker-compose-influxdb.yml @@ -25,7 +25,7 @@ services: - '8086:8086' grafana: - image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.10.2} 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 2da252ad2b..ff8bd1cbbc 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:10 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 68bad6a372..36b9b19ea0 100644 --- a/src/docker-compose/docker-compose-prometheus.yml +++ b/src/docker-compose/docker-compose-prometheus.yml @@ -22,7 +22,7 @@ services: #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true} prometheus-rsocket-proxy: - image: micrometermetrics/prometheus-rsocket-proxy:1.5.0 + image: micrometermetrics/prometheus-rsocket-proxy:1.0.0 container_name: prometheus-rsocket-proxy expose: - '9096' @@ -38,13 +38,13 @@ services: - micrometer.prometheus-proxy.tcp-port=7001 grafana: - image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.10.2} container_name: grafana ports: - '3000:3000' prometheus: - image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.10.2} 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 268579b9c8..ddc8e70065 100644 --- a/src/docker-compose/docker-compose-rabbitmq.yml +++ b/src/docker-compose/docker-compose-rabbitmq.yml @@ -4,21 +4,21 @@ 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.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' dataflow-server: environment: - SPRING_CLOUD_DATAFLOW_APPLICATIONPROPERTIES_STREAM_SPRING_RABBITMQ_HOST=rabbitmq - depends_on: - - rabbitmq app-import-stream: command: > @@ -27,6 +27,6 @@ services: 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/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:-2.10.2-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.10.2}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.10.2}'; echo 'Stream apps imported'" diff --git a/src/docker-compose/docker-compose.yml b/src/docker-compose/docker-compose.yml index 480b6bee89..70fbd60264 100644 --- a/src/docker-compose/docker-compose.yml +++ b/src/docker-compose/docker-compose.yml @@ -20,16 +20,45 @@ 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.4.22 + 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.10.2-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.10.2}${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 @@ -41,6 +70,10 @@ services: - SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI=${SKIPPER_URI:-http://skipper-server:7577}/api + - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/dataflow + - 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} @@ -48,7 +81,14 @@ services: - 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 + entrypoint: > + /bin/sh -c " + apt-get update && apt-get install --no-install-recommends -y wget && + wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && + chmod a+x /tmp/wait-for-it.sh && + /tmp/wait-for-it.sh mariadb:3306 -- /cnb/process/web" restart: always volumes: - ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf} @@ -64,7 +104,7 @@ services: 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/ver-log/3.0.1' --no-check-certificate --post-data='uri=maven://org.springframework.cloud.stream.app:log-sink-kafka: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-kafka:2.1.5.RELEASE'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.10.2-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.10.2-SNAPSHOT}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.10.2}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.10.2}'; echo 'Maven Stream apps imported'" app-import-task: @@ -80,18 +120,25 @@ services: skipper-server: user: root - image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.9.2-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.9.2}${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 - 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_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 + entrypoint: > + /bin/sh -c " + apt-get update && apt-get install --no-install-recommends -y wget && + wget --no-check-certificate -P /tmp/ https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && + chmod a+x /tmp/wait-for-it.sh && + /tmp/wait-for-it.sh mariadb:3306 -- /cnb/process/web" restart: always volumes: - - ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf} \ No newline at end of file + - ${HOST_MOUNT_PATH:-.}:${DOCKER_MOUNT_PATH:-/home/cnb/scdf} diff --git a/src/kubernetes/grafana/grafana-deployment.yaml b/src/kubernetes/grafana/grafana-deployment.yaml index b4a0c8c915..9c1bab3ac9 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.10.2-SNAPSHOT + - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.10.2 name: grafana env: - name: GF_SECURITY_ADMIN_USER diff --git a/src/kubernetes/mariadb/mariadb-deployment.yaml b/src/kubernetes/mariadb/mariadb-deployment.yaml index 8fd1d5aa38..ad165ddd00 100644 --- a/src/kubernetes/mariadb/mariadb-deployment.yaml +++ b/src/kubernetes/mariadb/mariadb-deployment.yaml @@ -18,13 +18,15 @@ spec: - image: mariadb:10.4.22 name: mariadb env: + - name: LANG + value: en_US.utf8 + - name: LC_ALL + value: en_US.utf8 - name: MARIADB_ROOT_PASSWORD valueFrom: secretKeyRef: key: mariadb-root-password name: mariadb - - name: MARIADB_DATABASE - value: 'dataflow' ports: - containerPort: 3306 name: mariadb diff --git a/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml b/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml index 86e23e28b0..f2f3c7ae8d 100644 --- a/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml +++ b/src/kubernetes/rabbitmq/rabbitmq-deployment.yaml @@ -22,7 +22,5 @@ spec: 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 diff --git a/src/kubernetes/server/server-config.yaml b/src/kubernetes/server/server-config.yaml index d2b0b75be6..da9c9b7d38 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 3813feefd3..06f7378a54 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.10.2-SNAPSHOT - imagePullPolicy: Always + image: springcloud/spring-cloud-dataflow-server:2.10.2 + imagePullPolicy: IfNotPresent volumeMounts: - name: config mountPath: /workspace/config @@ -26,63 +26,59 @@ 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.10.2-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' - # Add Maven repo for metadata artifact resolution for all stream apps - - name: SPRING_APPLICATION_JSON - value: "{ \"maven\": { \"local-repository\": null, \"remote-repositories\": { \"repo1\": { \"url\": \"https://repo.spring.io/libs-snapshot\"} } } }" + - 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:2.10.2' + - 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' + # Add Maven repo for metadata artifact resolution for all stream apps + - name: SPRING_APPLICATION_JSON + value: "{ \"maven\": { \"local-repository\": null, \"remote-repositories\": { \"repo1\": { \"url\": \"https://repo.spring.io/libs-snapshot\"} } } }" 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 99da9cb743..9deca77b2d 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 3a5cb80be9..86b8728344 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 4057ba875b..5dfac4ae3f 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.9.2-SNAPSHOT - imagePullPolicy: Always + image: springcloud/spring-cloud-skipper-server:2.9.2 + 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