Skip to content

Commit

Permalink
Update k8s deployment files
Browse files Browse the repository at this point in the history
  • Loading branch information
spring-builds committed Jul 30, 2021
1 parent 40dd128 commit 1192bf8
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/docker-compose/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

DATAFLOW_VERSION=2.8.1-SNAPSHOT
SKIPPER_VERSION=2.7.1-SNAPSHOT
DATAFLOW_VERSION=2.8.2-SNAPSHOT
SKIPPER_VERSION=2.7.2-SNAPSHOT
COMPOSE_PROJECT_NAME=scdf
COMPOSE_HTTP_TIMEOUT=300
4 changes: 2 additions & 2 deletions src/docker-compose/docker-compose-dood.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ services:
- SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_NETWORK=${COMPOSE_PROJECT_NAME:?COMPOSE_PROJECT_NAME must be set when DooD is enabled}_default
- SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_DELETE_CONTAINER_ON_EXIT=${DOCKER_DELETE_CONTAINER_ON_EXIT:-true}
# Override the CTR form maven to docker
#- SPRING_CLOUD_DATAFLOW_TASK_COMPOSED_TASK_RUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
- SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
#- SPRING_CLOUD_DATAFLOW_TASK_COMPOSED_TASK_RUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
- SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
- SPRING_CLOUD_DATAFLOW_SERVER_URI=${DATAFLOW_URI:-http://dataflow-server:9393}
- LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_DEPLOYER_SPI_LOCAL=DEBUG
entrypoint: >
Expand Down
2 changes: 1 addition & 1 deletion src/docker-compose/docker-compose-influxdb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
- '8086:8086'

grafana:
image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
container_name: grafana
ports:
- '3000:3000'
Expand Down
4 changes: 2 additions & 2 deletions src/docker-compose/docker-compose-prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ services:
- micrometer.prometheus-proxy.tcp-port=7001

grafana:
image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
container_name: grafana
ports:
- '3000:3000'

prometheus:
image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
container_name: prometheus
ports:
- '9090:9090'
4 changes: 2 additions & 2 deletions src/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
- ZOOKEEPER_CLIENT_PORT=2181

dataflow-server:
image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.8.1-SNAPSHOT}
image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.8.2-SNAPSHOT}
container_name: dataflow-server
ports:
- "9393:9393"
Expand Down Expand Up @@ -107,7 +107,7 @@ services:
echo 'Maven Task apps imported'"
skipper-server:
image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.7.1-SNAPSHOT}
image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.7.2-SNAPSHOT}
container_name: skipper
ports:
- "7577:7577"
Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes/grafana/grafana-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: grafana
spec:
containers:
- image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.8.1-SNAPSHOT
- image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.8.2-SNAPSHOT
name: grafana
env:
- name: GF_SECURITY_ADMIN_USER
Expand Down
4 changes: 2 additions & 2 deletions src/kubernetes/server/server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: scdf-server
image: springcloud/spring-cloud-dataflow-server:2.8.1-SNAPSHOT
image: springcloud/spring-cloud-dataflow-server:2.8.2-SNAPSHOT
imagePullPolicy: Always
volumeMounts:
- name: config
Expand Down Expand Up @@ -58,7 +58,7 @@ spec:
- 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.8.1-SNAPSHOT'
value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.8.2-SNAPSHOT'
- name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API
value: 'false'
- name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes/skipper/skipper-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: skipper
image: springcloud/spring-cloud-skipper-server:2.7.1-SNAPSHOT
image: springcloud/spring-cloud-skipper-server:2.7.2-SNAPSHOT
imagePullPolicy: Always
volumeMounts:
- name: config
Expand Down

0 comments on commit 1192bf8

Please sign in to comment.