[stable/spring-cloud-data-flow] Update to new SCDF version 2.6.0 (hel…

…m#23522) - update scdf version to 2.6.0 - update skipper version to 2.5.0 Signed-off-by: Chris Schaefer <[email protected]>
mmingorance-dh · Aug 12, 2020 · d441cf3 · d441cf3
1 parent 9d2e094
commit d441cf3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Toolkit for building data processing pipelines.
 name: spring-cloud-data-flow
-version: 2.7.2
-appVersion: 2.5.3.RELEASE
+version: 2.8.0
+appVersion: 2.6.0
 home: http://cloud.spring.io/spring-cloud-dataflow/
 sources:
 - https://github.com/spring-cloud/spring-cloud-dataflow

diff --git a/stable/spring-cloud-data-flow/README.md b/stable/spring-cloud-data-flow/README.md
@@ -152,7 +152,7 @@ The following tables list the configurable parameters and their default values.
 
 | Parameter                                                                                 | Description                                                                  | Default          |
 | ----------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | ---------------- |
-| server.version                                                                            | The version/tag of the Data Flow server                                      | 2.5.3.RELEASE
+| server.version                                                                            | The version/tag of the Data Flow server                                      | 2.6.0
 | server.imagePullPolicy                                                                    | The imagePullPolicy of the Data Flow server                                  | IfNotPresent
 | server.service.type                                                                       | The service type for the Data Flow server                                    | LoadBalancer
 | server.service.annotations                                                                | Extra annotations for service resource                                       | {}
@@ -170,7 +170,7 @@ The following tables list the configurable parameters and their default values.
 
 | Parameter                         | Description                                                      | Default          |
 | --------------------------------- | ---------------------------------------------------------------- | ---------------- |
-| skipper.version                   | The version/tag of the Skipper server                            | 2.4.3.RELEASE
+| skipper.version                   | The version/tag of the Skipper server                            | 2.5.0
 | skipper.imagePullPolicy           | The imagePullPolicy of the Skipper server                        | IfNotPresent
 | skipper.platformName              | The name of the configured platform account                      | default
 | skipper.service.type              | The service type for the Skipper server                          | ClusterIP

diff --git a/stable/spring-cloud-data-flow/templates/server-deployment.yaml b/stable/spring-cloud-data-flow/templates/server-deployment.yaml
@@ -80,6 +80,8 @@ spec:
           value: {{ .Values.features.batch.enabled | quote }}
         - name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED
           value: {{ .Values.features.batch.enabled | quote }}
+        - name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSED_TASK_RUNNER_URI
+          value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.6.0'
         {{- range $key, $value := .Values.server.extraEnv }}
         - name: {{ $key }}
           value: "{{ $value }}"

diff --git a/stable/spring-cloud-data-flow/values.yaml b/stable/spring-cloud-data-flow/values.yaml
@@ -18,7 +18,7 @@ initContainers:
 
 server:
   image: springcloud/spring-cloud-dataflow-server
-  version: 2.5.3.RELEASE
+  version: 2.6.0
   imagePullPolicy: IfNotPresent
   platformName: default
   trustCerts: false
@@ -47,7 +47,7 @@ server:
 skipper:
   enabled: true
   image: springcloud/spring-cloud-skipper-server
-  version: 2.4.3.RELEASE
+  version: 2.5.0
   imagePullPolicy: IfNotPresent
   platformName: default
   trustCerts: false