From 3e00094e2ad77aaad118d7d32c19d174fbd55c40 Mon Sep 17 00:00:00 2001 From: Chris Schaefer Date: Mon, 3 Feb 2020 16:39:26 -0500 Subject: [PATCH] [stable/spring-cloud-data-flow] Update to new SCDF version 2.4.0 (#20517) - update scdf version to 2.4.0 - update skipper version to 2.3.0 - update chart dependency versions Signed-off-by: Chris Schaefer --- stable/spring-cloud-data-flow/Chart.yaml | 4 ++-- stable/spring-cloud-data-flow/README.md | 13 +++++++------ stable/spring-cloud-data-flow/requirements.lock | 16 ++++++++-------- stable/spring-cloud-data-flow/requirements.yaml | 12 ++++++------ .../templates/_helpers.tpl | 2 +- stable/spring-cloud-data-flow/values.yaml | 9 ++++++--- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml index 72cbe25e67..aab6dd0e25 100644 --- 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.5.3 -appVersion: 2.3.1.RELEASE +version: 2.6.0 +appVersion: 2.4.0.RELEASE 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 index 257fd3cdb8..73967dc91f 100644 --- a/stable/spring-cloud-data-flow/README.md +++ b/stable/spring-cloud-data-flow/README.md @@ -111,7 +111,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.3.1.RELEASE +| server.version | The version/tag of the Data Flow server | 2.4.0.RELEASE | 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 | {} @@ -126,7 +126,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.2.2.RELEASE +| skipper.version | The version/tag of the Skipper server | 2.3.0.RELEASE | 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 @@ -146,10 +146,11 @@ The following tables list the configurable parameters and their default values. ### RabbitMQ Configuration -| Parameter | Description | Default | -| -------------------------- | ---------------------------------------- | ------------------------- | -| rabbitmq.enabled | Enable RabbitMQ as the middleware to use | true -| rabbitmq.rabbitmqUsername | RabbitMQ user name | user +| Parameter | Description | Default | +| --------------------------- | ------------------------------------------- | ------------------------- | +| rabbitmq.enabled | Enable RabbitMQ as the middleware to use | true +| rabbitmq.rabbitmq.username | RabbitMQ user name | user +| rabbitmq.rabbitmq.password | RabbitMQ password to encode into the secret | changeme ### RabbitMQ HA Configuration diff --git a/stable/spring-cloud-data-flow/requirements.lock b/stable/spring-cloud-data-flow/requirements.lock index 1f2c134e80..2863ce8f3d 100644 --- a/stable/spring-cloud-data-flow/requirements.lock +++ b/stable/spring-cloud-data-flow/requirements.lock @@ -1,21 +1,21 @@ dependencies: - name: mysql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.1.0 + version: 1.6.2 - name: rabbitmq repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.6.16 + version: 6.16.6 - name: rabbitmq-ha repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.27.1 + version: 1.38.2 - name: kafka repository: https://kubernetes-charts-incubator.storage.googleapis.com/ - version: 0.13.11 + version: 0.20.8 - name: prometheus repository: https://kubernetes-charts.storage.googleapis.com/ - version: 9.3.1 + version: 10.4.0 - name: grafana repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.0.2 -digest: sha256:67025c3ac98c98e9b1530c00d199217fb74b50202226b36756c213ac0617795d -generated: "2019-12-06T09:19:02.158505764-05:00" + version: 4.5.0 +digest: sha256:02cce6791cbddab650f8165cb4865133b497bde53b9103f1c714129efc1e2671 +generated: "2020-01-31T14:36:49.309488742-05:00" diff --git a/stable/spring-cloud-data-flow/requirements.yaml b/stable/spring-cloud-data-flow/requirements.yaml index b7b7036bcc..e789de00ef 100644 --- a/stable/spring-cloud-data-flow/requirements.yaml +++ b/stable/spring-cloud-data-flow/requirements.yaml @@ -1,25 +1,25 @@ dependencies: - name: mysql - version: 1.1.0 + version: 1.6.2 repository: https://kubernetes-charts.storage.googleapis.com/ condition: mysql.enabled - name: rabbitmq - version: 0.6.16 + version: 6.16.6 repository: https://kubernetes-charts.storage.googleapis.com/ condition: rabbitmq.enabled - name: rabbitmq-ha - version: 1.27.1 + version: 1.38.2 repository: https://kubernetes-charts.storage.googleapis.com/ condition: rabbitmq-ha.enabled - name: kafka - version: 0.13.11 + version: 0.20.8 repository: https://kubernetes-charts-incubator.storage.googleapis.com/ condition: kafka.enabled - name: prometheus - version: 9.3.1 + version: 10.4.0 repository: https://kubernetes-charts.storage.googleapis.com/ condition: features.monitoring.enabled - name: grafana - version: 4.0.2 + version: 4.5.0 repository: https://kubernetes-charts.storage.googleapis.com/ condition: features.monitoring.enabled diff --git a/stable/spring-cloud-data-flow/templates/_helpers.tpl b/stable/spring-cloud-data-flow/templates/_helpers.tpl index 6cff13dd3e..882e872008 100644 --- a/stable/spring-cloud-data-flow/templates/_helpers.tpl +++ b/stable/spring-cloud-data-flow/templates/_helpers.tpl @@ -125,6 +125,6 @@ Create the name of the service account to use {{- if index .Values "rabbitmq-ha" "enabled" -}} {{ index .Values "rabbitmq-ha" "rabbitmqUsername" }} {{- else if .Values.rabbitmq.enabled -}} - {{ .Values.rabbitmq.rabbitmqUsername }} + {{ .Values.rabbitmq.rabbitmq.username }} {{- end -}} {{- end -}} diff --git a/stable/spring-cloud-data-flow/values.yaml b/stable/spring-cloud-data-flow/values.yaml index 87128d995d..21c9117287 100644 --- 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.3.1.RELEASE + version: 2.4.0.RELEASE imagePullPolicy: IfNotPresent platformName: default trustCerts: false @@ -40,7 +40,7 @@ server: skipper: enabled: true image: springcloud/spring-cloud-skipper-server - version: 2.2.2.RELEASE + version: 2.3.0.RELEASE imagePullPolicy: IfNotPresent platformName: default trustCerts: false @@ -68,7 +68,10 @@ deployer: rabbitmq: enabled: true - rabbitmqUsername: user + rabbitmq: + username: user + # this value will be encoded into a secret + password: changeme rabbitmq-ha: enabled: false