Skip to content

Commit 0e45cd2

Browse files
scdf-build-botscdf-build-bot
committed
Update k8s deployment files
1 parent 7d563cb commit 0e45cd2

9 files changed

+15
-15
lines changed

‎src/docker-compose/.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
DATAFLOW_VERSION=2.9.3-SNAPSHOT
3-
SKIPPER_VERSION=2.8.3-SNAPSHOT
2+
DATAFLOW_VERSION=2.9.5-SNAPSHOT
3+
SKIPPER_VERSION=2.8.5-SNAPSHOT
44
COMPOSE_PROJECT_NAME=scdf
55
COMPOSE_HTTP_TIMEOUT=300

‎src/docker-compose/docker-compose-dood.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
- SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_PORTRANGE_HIGH=61000
4141

4242
# Override the CTR form maven to docker
43-
- SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}${BP_JVM_VERSION:-}
43+
- SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}${BP_JVM_VERSION:-}
4444
- SPRING_CLOUD_DATAFLOW_SERVER_URI=${DATAFLOW_URI:-http://dataflow-server:9393}
4545
entrypoint: >
4646
bin/sh -c "
@@ -85,7 +85,7 @@ services:
8585
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}';
8686
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';
8787
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';
88-
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}${BP_JVM_VERSION:-}';
88+
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}${BP_JVM_VERSION:-}';
8989
echo 'Docker Stream apps imported'"
9090
9191
app-import-task:

‎src/docker-compose/docker-compose-influxdb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
- '8086:8086'
2626

2727
grafana:
28-
image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}
28+
image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}
2929
container_name: grafana
3030
ports:
3131
- '3000:3000'

‎src/docker-compose/docker-compose-prometheus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ services:
3838
- micrometer.prometheus-proxy.tcp-port=7001
3939

4040
grafana:
41-
image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}
41+
image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}
4242
container_name: grafana
4343
ports:
4444
- '3000:3000'
4545

4646
prometheus:
47-
image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}
47+
image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}
4848
container_name: prometheus
4949
ports:
5050
- '9090:9090'

‎src/docker-compose/docker-compose-rabbitmq.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ services:
2727
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}';
2828
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';
2929
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';
30-
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}';
30+
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}';
3131
echo 'Stream apps imported'"
3232

‎src/docker-compose/docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ services:
5555

5656
dataflow-server:
5757
user: root
58-
image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}${BP_JVM_VERSION:-}
58+
image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}${BP_JVM_VERSION:-}
5959
container_name: dataflow-server
6060
ports:
6161
- "9393:9393"
@@ -105,7 +105,7 @@ services:
105105
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}';
106106
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';
107107
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';
108-
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.9.3-SNAPSHOT}';
108+
wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.9.5-SNAPSHOT}';
109109
echo 'Maven Stream apps imported'"
110110
111111
app-import-task:
@@ -121,7 +121,7 @@ services:
121121
122122
skipper-server:
123123
user: root
124-
image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.8.3-SNAPSHOT}${BP_JVM_VERSION:-}
124+
image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.8.5-SNAPSHOT}${BP_JVM_VERSION:-}
125125
container_name: skipper
126126
ports:
127127
- "7577:7577"

‎src/kubernetes/grafana/grafana-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
app: grafana
1515
spec:
1616
containers:
17-
- image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.9.3-SNAPSHOT
17+
- image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.9.5-SNAPSHOT
1818
name: grafana
1919
env:
2020
- name: GF_SECURITY_ADMIN_USER

‎src/kubernetes/server/server-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: scdf-server
19-
image: springcloud/spring-cloud-dataflow-server:2.9.3-SNAPSHOT
19+
image: springcloud/spring-cloud-dataflow-server:2.9.5-SNAPSHOT
2020
imagePullPolicy: Always
2121
volumeMounts:
2222
- name: config
@@ -58,7 +58,7 @@ spec:
5858
- name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
5959
value: 'true'
6060
- name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI
61-
value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.9.3-SNAPSHOT'
61+
value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.9.5-SNAPSHOT'
6262
- name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API
6363
value: 'false'
6464
- name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API

‎src/kubernetes/skipper/skipper-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: skipper
19-
image: springcloud/spring-cloud-skipper-server:2.8.3-SNAPSHOT
19+
image: springcloud/spring-cloud-skipper-server:2.8.5-SNAPSHOT
2020
imagePullPolicy: Always
2121
volumeMounts:
2222
- name: config

0 commit comments

Comments
 (0)