Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Corneil/fix task runner 29x #5014

Merged
merged 13 commits into from
Jul 19, 2022
Merged

Corneil/fix task runner 29x #5014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
772e56a
Updated carvel config
Jul 18, 2022
de78135
Updated carvel actions
Jul 18, 2022
433c106
updated versions
Jul 19, 2022
afab521
updated versions
Jul 19, 2022
cb64a79
Merge branch '2.9.x' into 2.9.x
Jul 19, 2022
6616d5a
updated versions
Jul 19, 2022
5f8fa39
updated versions
Jul 19, 2022
31f5e6e
Merge remote-tracking branch 'origin/2.9.x' into 2.9.x
Jul 19, 2022
a71be67
Merge remote-tracking branch 'upstream/2.9.x' into 2.9.x
Jul 19, 2022
9d6f290
updated versions
Jul 19, 2022
6bf4028
Merge remote-tracking branch 'upstream/2.9.x' into 2.9.x
Jul 19, 2022
cd91f50
updated versions
Jul 19, 2022
22af264
updated versions
Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ spring:
checksum-sha256-url: "{repository}/org/springframework/cloud/spring-cloud-dataflow-shell/{version}/spring-cloud-dataflow-shell-{version}.jar.sha256"
task:
composedtaskrunner:
uri: "maven://org.springframework.cloud:spring-cloud-dataflow-composed-task-runner:@project.version@"
uri: "maven://org.springframework.cloud:spring-cloud-dataflow-composed-task-runner:@dataflow.version@"
deployer-properties:
group-excludes:
- spring.cloud.deployer.kubernetes.fabric8
Expand Down
2 changes: 1 addition & 1 deletion src/carvel/templates/imgpkg/case2/fakeimages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spec:
spec:
containers:
- name: fakectr
image: springcloud/spring-cloud-dataflow-composed-task-runner:(@= data.values.project.version @)
image: springcloud/spring-cloud-dataflow-composed-task-runner:(@= data.values.dataflow.version @)
4 changes: 2 additions & 2 deletions src/templates/kubernetes/server/server-deployment.yaml
View file
Open in desktop
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:@project.version@
image: springcloud/spring-cloud-dataflow-server:@dataflow.version@
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:@project.version@'
value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:@dataflow.version@'
- name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API
value: 'false'
- name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
Expand Down