From 6cb6b36f91da60adbc27e1d7b3590b9ba29c63c9 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Mon, 30 Dec 2024 15:32:22 +0200 Subject: [PATCH] Update SCDF Version in scripts and YAML files and docs Update from 2.11.X-SNAPSHOT to 3.0.0-SNAPSHOT --- .../workflows/download-jar/gradle.properties | 2 +- .../asciidoc/appendix-create-containers.adoc | 43 +++---------------- .../appendix-local-k8s-development.adoc | 4 +- .../asciidoc/configuration-kubernetes.adoc | 2 +- .../controller/AboutControllerTests.java | 6 +-- .../resources/META-INF/build-info.properties | 2 +- .../kapp-controller-default/README.adoc | 8 ++-- .../scdf-repo-ghcr.yml | 2 +- .../kapp-controller-default/scdf-values.yml | 2 +- .../examples/kapp-default/scdf-values.yml | 6 +-- .../kubectl-default/scdf-minikube-values.yml | 6 +-- .../examples/kubectl-default/scdf-values.yml | 6 +-- .../docs/examples/tanzu-airgap/README.adoc | 4 +- .../examples/tanzu-cloud-default/README.adoc | 4 +- .../docs/examples/tanzu-default/README.adoc | 12 +++--- .../examples/tanzu-external-kafka/README.adoc | 10 ++--- .../tanzu-external-postgres/README.adoc | 8 ++-- src/carvel/docs/random-notes.adoc | 4 +- src/deploy/README.html | 4 +- .../images/pull-composed-task-runner.sh | 2 +- src/deploy/images/pull-dataflow.sh | 2 +- src/deploy/images/pull-grafana.sh | 2 +- .../images/pull-single-step-batch-job.sh | 2 +- src/deploy/images/pull-skipper.sh | 2 +- src/deploy/k8s/deploy-scdf.sh | 8 ++-- src/deploy/k8s/update-scdf.sh | 4 +- src/deploy/k8s/yaml/server-config.yaml | 1 + src/docker-compose/.env | 4 +- src/docker-compose/docker-compose-dood.yml | 4 +- .../docker-compose-influxdb.yml | 2 +- src/docker-compose/docker-compose-kafka.yml | 2 +- .../docker-compose-prometheus.yml | 4 +- .../docker-compose-rabbitmq.yml | 2 +- src/docker-compose/docker-compose.yml | 4 +- src/kubernetes/server/server-deployment.yaml | 4 +- .../skipper/skipper-deployment.yaml | 2 +- src/local/.env | 5 +++ src/local/README.md | 2 +- src/local/docker-compose.yml | 2 +- src/local/download-apps.sh | 2 +- src/local/register-apps.sh | 15 ++----- 41 files changed, 91 insertions(+), 121 deletions(-) create mode 100644 src/local/.env diff --git a/.github/workflows/download-jar/gradle.properties b/.github/workflows/download-jar/gradle.properties index b8afb6f3df..c1e6bd31be 100644 --- a/.github/workflows/download-jar/gradle.properties +++ b/.github/workflows/download-jar/gradle.properties @@ -1,4 +1,4 @@ artifactGroup=org.springframework.cloud artifactId=spring-cloud-dataflow-server -artifactVersion=2.11.3-SNAPSHOT +artifactVersion=3.0.0-SNAPSHOT artifactPath=./dl \ No newline at end of file diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc index 91714cad5b..b9cf90cddb 100644 --- a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc +++ b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc @@ -43,7 +43,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor Usage: `download-apps.sh [version]` -* `version` is the dataflow-server version like `2.11.3`. Default is `2.11.3-SNAPSHOT` +* `version` is the dataflow-server version like `2.11.3`. Default is `3.0.0-SNAPSHOT` ===== `src/local/create-containers.sh` Creates all containers and pushes to local docker registry. @@ -52,8 +52,8 @@ This script requires link:https://github.com/GoogleContainerTools/jib/tree/maste Usage: `create-containers.sh [version] [jre-version]` -* `version` is the dataflow-server version like `2.11.3`. Default is `2.11.3-SNAPSHOT` -* `jre-version` should be one of 11, 17. Default is 11 +* `version` is the dataflow-server version like `3.0.0`. Default is `3.0.0-SNAPSHOT` +* `jre-version` should be one of 17, 21. Default is 17 ==== Scripts in `spring-cloud-skipper` @@ -64,7 +64,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor Usage: `download-app.sh [version]` -* `version` is the skipper version like `2.11.3` or default is `2.11.3-SNAPSHOT` +* `version` is the skipper version like `3.0.0` or default is `3.0.0-SNAPSHOT` ===== `local/create-container.sh` Creates all containers and pushes to local docker registry. @@ -72,8 +72,8 @@ This script requires link:https://github.com/GoogleContainerTools/jib/tree/maste Usage: `create-containers.sh [version] [jre-version]` -* `version` is the skipper version like `2.11.3` or default is `2.11.3-SNAPSHOT` -* `jre-version` should be one of 11, 17 +* `version` is the skipper version like `3.0.0` or default is `3.0.0-SNAPSHOT` +* `jre-version` should be one of 17, 21 ==== Scripts in `stream-applications` @@ -85,36 +85,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor Usage: `download-apps.sh [version] [broker] [filter]` -* `version` is the stream applications version like `4.0.0` or default is `4.0.1-SNAPSHOT` +* `version` is the stream applications version like `5.0.0` or default is `5.0.1-SNAPSHOT` * `broker` is one of rabbitmq, rabbit or kafka * `filter` is a name of an application or a partial name that will be matched. -===== `local/create-containers.sh` -Creates all containers and pushes to local docker registry. - -This script requires link:https://github.com/GoogleContainerTools/jib/tree/master/jib-cli[jib-cli] - -Usage: `create-containers.sh [version] [broker] [jre-version] [filter]` - -* `version` is the stream-applications version like `4.0.0` or default is `4.0.1-SNAPSHOT` -* `broker` is one of rabbitmq, rabbit or kafka -* `jre-version` must be 17 -* `filter` is a name of an application or a partial name that will be matched. - -If the file is not present required to create the container the script will skip the one. - -===== `local/pack-containers.sh` -Creates all containers and pushes to local docker registry. - -This script requires link:https://buildpacks.io/docs/tools/pack[packeto pack] - -Usage: `pack-containers.sh [version] [broker] [jre-version] [filter]` - -* `version` is the stream-applications version like `4.0.0` or default is `4.0.1-SNAPSHOT` -* `broker` is one of rabbitmq, rabbit or kafka -* `jre-version` must be 17 -* `filter` is a name of an application or a partial name that will be matched. - -If the required file is not present to create the container the script will skip that one. - -NOTE: If any parameter is provided all those to the left of it should be considered required. diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc index 6f83aa4f84..3d01c226f5 100644 --- a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc +++ b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc @@ -139,8 +139,8 @@ This example shows the versions of the current development snapshot. [source,shell] .... -export DATAFLOW_VERSION=2.11.5-SNAPSHOT -export SKIPPER_VERSION=2.11.5-SNAPSHOT +export DATAFLOW_VERSION=3.0.0-SNAPSHOT +export SKIPPER_VERSION=3.0.0-SNAPSHOT .... Before you can install SCDF you will need to pull the following images to ensure they are present for uploading to the k8s cluster. diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc index 878d33d255..e5ca3a534a 100644 --- a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc +++ b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc @@ -580,7 +580,7 @@ The following YAML snippet from a Deployment is an example of mounting a ConfigM ... containers: - name: scdf-server - image: springcloud/spring-cloud-dataflow-server:2.11.3-SNAPSHOT + image: springcloud/spring-cloud-dataflow-server:3.0.0-SNAPSHOT imagePullPolicy: IfNotPresent volumeMounts: - name: config diff --git a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java index 7f9860abb4..5a1d3c2f89 100644 --- a/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java +++ b/spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java @@ -147,7 +147,7 @@ void checksumDisabled() throws Exception { @SpringBootTest(classes = TestDependencies.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @TestPropertySource(properties = { - "spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.version=2.11.3-SNAPSHOT", + "spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.version=3.0.0-SNAPSHOT", "spring.cloud.dataflow.version-info.dependency-fetch.enabled=false", "spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.checksum-sha1=ABCDEFG" }) @@ -170,8 +170,8 @@ void snapshotVersionInfo() throws Exception { ResultActions result = mockMvc.perform(get("/about").accept(MediaType.APPLICATION_JSON)).andDo(print()).andExpect(status().isOk()); result.andExpect(jsonPath("$.featureInfo.analyticsEnabled", is(true))) .andExpect(jsonPath("$.versionInfo.shell.name", is("Spring Cloud Data Flow Shell"))) - .andExpect(jsonPath("$.versionInfo.shell.url", is("https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-dataflow-shell/2.11.3-SNAPSHOT/spring-cloud-dataflow-shell-2.11.3-SNAPSHOT.jar"))) - .andExpect(jsonPath("$.versionInfo.shell.version", is("2.11.3-SNAPSHOT"))) + .andExpect(jsonPath("$.versionInfo.shell.url", is("https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-dataflow-shell/3.0.0-SNAPSHOT/spring-cloud-dataflow-shell-3.0.0-SNAPSHOT.jar"))) + .andExpect(jsonPath("$.versionInfo.shell.version", is("3.0.0-SNAPSHOT"))) .andExpect(jsonPath("$.versionInfo.shell.checksumSha1").doesNotExist()) .andExpect(jsonPath("$.versionInfo.shell.checksumSha256").doesNotExist()); } diff --git a/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties b/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties index 9ee9d6f32a..8f35969cce 100644 --- a/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties +++ b/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties @@ -2,4 +2,4 @@ build.artifact=spring-cloud-dataflow-server build.group=org.springframework.cloud build.name=Spring Cloud Data Flow Server build.time=2023-11-08T17\:15\:26.885Z -build.version=2.11.3-SNAPSHOT +build.version=3.0.0-SNAPSHOT diff --git a/src/carvel/docs/examples/kapp-controller-default/README.adoc b/src/carvel/docs/examples/kapp-controller-default/README.adoc index 3ea4277200..77cb52531f 100644 --- a/src/carvel/docs/examples/kapp-controller-default/README.adoc +++ b/src/carvel/docs/examples/kapp-controller-default/README.adoc @@ -27,14 +27,14 @@ scdf-snapshot.tanzu.vmware 2m35s Reconcile succeeded kubectl get packages NAME PACKAGEMETADATA NAME VERSION AGE -scdf.tanzu.vmware.com.2.11.3-SNAPSHOT scdf.tanzu.vmware.com 2.11.3-SNAPSHOT 2m23s +scdf.tanzu.vmware.com.3.0.0-SNAPSHOT scdf.tanzu.vmware.com 3.0.0-SNAPSHOT 2m23s ---- NOTE: Above package and package repos are defined within public repos on a VMWare space so you don't get trouble with rate limiting(which would be a case with dockerhub). -Install `2.11.3-SNAPSHOT` with `postgres` and `rabbit`: +Install `3.0.0-SNAPSHOT` with `postgres` and `rabbit`: [source, bash] ---- @@ -45,9 +45,9 @@ kapp deploy \ kubectl get packageinstalls NAME PACKAGE NAME PACKAGE VERSION DESCRIPTION AGE -scdf-demo scdf.tanzu.vmware.com 2.11.3-SNAPSHOT Reconciling 12s +scdf-demo scdf.tanzu.vmware.com 3.0.0-SNAPSHOT Reconciling 12s kubectl get packageinstalls NAME PACKAGE NAME PACKAGE VERSION DESCRIPTION AGE -scdf-demo scdf.tanzu.vmware.com 2.11.3-SNAPSHOT Reconcile succeeded 88s +scdf-demo scdf.tanzu.vmware.com 3.0.0-SNAPSHOT Reconcile succeeded 88s ---- diff --git a/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml b/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml index 043d100ce0..82c3f7c719 100644 --- a/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml +++ b/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml @@ -5,4 +5,4 @@ metadata: spec: fetch: imgpkgBundle: - image: springcloud/scdf-oss-repo:2.11.3-SNAPSHOT + image: springcloud/scdf-oss-repo:3.0.0-SNAPSHOT diff --git a/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml b/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml index c6a5662822..c67c5f0fb0 100644 --- a/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml +++ b/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml @@ -8,7 +8,7 @@ spec: packageRef: refName: scdf.tanzu.vmware.com versionSelection: - constraints: 2.11.3-SNAPSHOT + constraints: 3.0.0-SNAPSHOT prereleases: {} values: - secretRef: diff --git a/src/carvel/docs/examples/kapp-default/scdf-values.yml b/src/carvel/docs/examples/kapp-default/scdf-values.yml index 08f6136c6e..9a3df4ab31 100644 --- a/src/carvel/docs/examples/kapp-default/scdf-values.yml +++ b/src/carvel/docs/examples/kapp-default/scdf-values.yml @@ -3,10 +3,10 @@ scdf: server: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT skipper: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT ctr: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT diff --git a/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml b/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml index 73336c85b0..00dbb7e4ad 100644 --- a/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml +++ b/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml @@ -3,13 +3,13 @@ scdf: server: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT service: type: NodePort skipper: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT ctr: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT diff --git a/src/carvel/docs/examples/kubectl-default/scdf-values.yml b/src/carvel/docs/examples/kubectl-default/scdf-values.yml index 08f6136c6e..9a3df4ab31 100644 --- a/src/carvel/docs/examples/kubectl-default/scdf-values.yml +++ b/src/carvel/docs/examples/kubectl-default/scdf-values.yml @@ -3,10 +3,10 @@ scdf: server: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT skipper: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT ctr: image: - tag: 2.11.3-SNAPSHOT + tag: 3.0.0-SNAPSHOT diff --git a/src/carvel/docs/examples/tanzu-airgap/README.adoc b/src/carvel/docs/examples/tanzu-airgap/README.adoc index 30cad701b0..0f6d46253b 100644 --- a/src/carvel/docs/examples/tanzu-airgap/README.adoc +++ b/src/carvel/docs/examples/tanzu-airgap/README.adoc @@ -25,7 +25,7 @@ Install _Dataflow_ with configured _GitHub Container Registry_ secrets: ---- tanzu package install scdf-demo \ --package-name scdf.tanzu.vmware.com \ - --version 2.11.3-SNAPSHOT \ + --version 3.0.0-SNAPSHOT \ --values-file scdf-values.yml ---- @@ -39,7 +39,7 @@ Copy source, sink and task: [source, bash] ---- imgpkg copy \ - -b springcloud/scdf-oss-repo:2.11.3-SNAPSHOT \ + -b springcloud/scdf-oss-repo:3.0.0-SNAPSHOT \ --to-repo ghcr.io/jvalkeal/private/scdf-oss-repo imgpkg copy \ diff --git a/src/carvel/docs/examples/tanzu-cloud-default/README.adoc b/src/carvel/docs/examples/tanzu-cloud-default/README.adoc index 61cda24eaa..a634866489 100644 --- a/src/carvel/docs/examples/tanzu-cloud-default/README.adoc +++ b/src/carvel/docs/examples/tanzu-cloud-default/README.adoc @@ -18,13 +18,13 @@ repository. If you look `scdf-values.yml` it simply uses defaults and defines _Dataflow_ server service type as `LoadBalancer` which is probably something you need if wanting to access server publicly. -Setup repo `2.11.3-SNAPSHOT` repo: +Setup repo `3.0.0-SNAPSHOT` repo: [source, bash] ---- tanzu package install scdf-demo \ --package-name scdf.tanzu.vmware.com \ - --version 2.11.3-SNAPSHOT \ + --version 3.0.0-SNAPSHOT \ --values-file scdf-values.yml ---- diff --git a/src/carvel/docs/examples/tanzu-default/README.adoc b/src/carvel/docs/examples/tanzu-default/README.adoc index e14b55e4c2..e73a841328 100644 --- a/src/carvel/docs/examples/tanzu-default/README.adoc +++ b/src/carvel/docs/examples/tanzu-default/README.adoc @@ -20,16 +20,16 @@ _ghcr_ where everything is relocated unter a space of a that repository. Follow instructions in {example-kapp-controller-install} to setup kapp-controller. Follow instructions in {example-secretgen-controller-install} to setup secretgen-controller. -Setup `2.11.3-SNAPSHOT` repo: +Setup `3.0.0-SNAPSHOT` repo: [source, bash] ---- tanzu package repository add scdf-oss-repo \ - --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT + --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT tanzu package repository list NAME REPOSITORY STATUS DETAILS - scdf-oss-repo springcloud/scdf-oss-repo:2.11.3-SNAPSHOT Reconcile succeeded + scdf-oss-repo springcloud/scdf-oss-repo:3.0.0-SNAPSHOT Reconcile succeeded tanzu package available list NAME DISPLAY-NAME SHORT-DESCRIPTION @@ -37,9 +37,9 @@ tanzu package available list tanzu package available list scdf.tanzu.vmware.com NAME VERSION RELEASED-AT - scdf.tanzu.vmware.com 2.11.3-SNAPSHOT + scdf.tanzu.vmware.com 3.0.0-SNAPSHOT -tanzu package available get scdf.tanzu.vmware.com/2.11.3-SNAPSHOT --values-schema +tanzu package available get scdf.tanzu.vmware.com/3.0.0-SNAPSHOT --values-schema KEY DEFAULT TYPE DESCRIPTION scdf.binder.kafka.broker.host string External kafka broker host scdf.binder.kafka.broker.port string External kafka broker port @@ -52,7 +52,7 @@ Install: ---- tanzu package install scdf-demo \ --package-name scdf.tanzu.vmware.com \ - --version 2.11.3-SNAPSHOT + --version 3.0.0-SNAPSHOT ---- Cleanup: diff --git a/src/carvel/docs/examples/tanzu-external-kafka/README.adoc b/src/carvel/docs/examples/tanzu-external-kafka/README.adoc index edf56b266c..cac14f52c1 100644 --- a/src/carvel/docs/examples/tanzu-external-kafka/README.adoc +++ b/src/carvel/docs/examples/tanzu-external-kafka/README.adoc @@ -25,11 +25,11 @@ Setup _Dataflow_ package repo: [source, bash] ---- -tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT +tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT tanzu package repository list NAME REPOSITORY STATUS DETAILS - scdf-oss-repo springcloud/scdf-oss-repo:2.11.3-SNAPSHOT Reconcile succeeded + scdf-oss-repo springcloud/scdf-oss-repo:3.0.0-SNAPSHOT Reconcile succeeded tanzu package available list NAME DISPLAY-NAME SHORT-DESCRIPTION @@ -37,9 +37,9 @@ tanzu package available list tanzu package available list scdf.tanzu.vmware.com NAME VERSION RELEASED-AT - scdf.tanzu.vmware.com 2.11.3-SNAPSHOT + scdf.tanzu.vmware.com 3.0.0-SNAPSHOT -tanzu package available get scdf.tanzu.vmware.com/2.11.3-SNAPSHOT --values-schema +tanzu package available get scdf.tanzu.vmware.com/3.0.0-SNAPSHOT --values-schema KEY DEFAULT TYPE DESCRIPTION scdf.binder.kafka.broker.host string External kafka broker host scdf.binder.kafka.broker.port string External kafka broker port @@ -54,7 +54,7 @@ Install: ---- tanzu package install scdf-demo \ --package-name scdf.tanzu.vmware.com \ - --version 2.11.3-SNAPSHOT \ + --version 3.0.0-SNAPSHOT \ --values-file examples/tanzu-external-kafka/minikube-values.yml ---- diff --git a/src/carvel/docs/examples/tanzu-external-postgres/README.adoc b/src/carvel/docs/examples/tanzu-external-postgres/README.adoc index af0bac0041..ec233bbdb0 100644 --- a/src/carvel/docs/examples/tanzu-external-postgres/README.adoc +++ b/src/carvel/docs/examples/tanzu-external-postgres/README.adoc @@ -25,11 +25,11 @@ Setup _Dataflow_ package repo: [source, bash] ---- -tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT +tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT tanzu package repository list NAME REPOSITORY STATUS DETAILS - scdf-oss-repo springcloud/scdf-oss-repo:2.11.3-SNAPSHOT Reconcile succeeded + scdf-oss-repo springcloud/scdf-oss-repo:3.0.0-SNAPSHOT Reconcile succeeded tanzu package available list NAME DISPLAY-NAME SHORT-DESCRIPTION @@ -37,7 +37,7 @@ tanzu package available list tanzu package available list scdf.tanzu.vmware.com NAME VERSION RELEASED-AT - scdf.tanzu.vmware.com 2.11.3-SNAPSHOT + scdf.tanzu.vmware.com 3.0.0-SNAPSHOT ---- Get password for database and update values yml and install: @@ -46,6 +46,6 @@ Get password for database and update values yml and install: ---- tanzu package install scdf-demo \ --package-name scdf.tanzu.vmware.com \ - --version 2.11.3-SNAPSHOT \ + --version 3.0.0-SNAPSHOT \ --values-file examples/tanzu-external-postgres/minikube-values.yml ---- diff --git a/src/carvel/docs/random-notes.adoc b/src/carvel/docs/random-notes.adoc index 908275dd70..de5ab5f708 100644 --- a/src/carvel/docs/random-notes.adoc +++ b/src/carvel/docs/random-notes.adoc @@ -6,8 +6,8 @@ What's inside package and package repository bundles. [source, bash] ---- -imgpkg pull -b springcloud/scdf-oss-repo:2.11.3-SNAPSHOT -o scdf-oss-repo-snapshot -imgpkg pull -b springcloud/scdf-oss-package:2.11.3-SNAPSHOT -o scdf-package-snapshot +imgpkg pull -b springcloud/scdf-oss-repo:3.0.0-SNAPSHOT -o scdf-oss-repo-snapshot +imgpkg pull -b springcloud/scdf-oss-package:3.0.0-SNAPSHOT -o scdf-package-snapshot ---- == Some debug notes diff --git a/src/deploy/README.html b/src/deploy/README.html index e1bb2cbb99..7f4b177c09 100644 --- a/src/deploy/README.html +++ b/src/deploy/README.html @@ -1280,8 +1280,8 @@
Configure Database
-
export DATAFLOW_VERSION=2.11.5-SNAPSHOT
-export SKIPPER_VERSION=2.11.5-SNAPSHOT
+
export DATAFLOW_VERSION=3.0.0-SNAPSHOT
+export SKIPPER_VERSION=3.0.0-SNAPSHOT
diff --git a/src/deploy/images/pull-composed-task-runner.sh b/src/deploy/images/pull-composed-task-runner.sh index 2276dd3a32..f32d679caa 100755 --- a/src/deploy/images/pull-composed-task-runner.sh +++ b/src/deploy/images/pull-composed-task-runner.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ "$DATAFLOW_VERSION" = "" ]; then - DATAFLOW_VERSION=2.11.5-SNAPSHOT + DATAFLOW_VERSION=3.0.0-SNAPSHOT fi docker pull "springcloud/spring-cloud-dataflow-composed-task-runner:$DATAFLOW_VERSION" diff --git a/src/deploy/images/pull-dataflow.sh b/src/deploy/images/pull-dataflow.sh index 6e75a92f7e..52082aa73a 100755 --- a/src/deploy/images/pull-dataflow.sh +++ b/src/deploy/images/pull-dataflow.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ "$DATAFLOW_VERSION" = "" ]; then - DATAFLOW_VERSION=2.11.5-SNAPSHOT + DATAFLOW_VERSION=3.0.0-SNAPSHOT fi docker pull "springcloud/spring-cloud-dataflow-server:$DATAFLOW_VERSION" diff --git a/src/deploy/images/pull-grafana.sh b/src/deploy/images/pull-grafana.sh index 6c81eece02..e3ec7c6aed 100755 --- a/src/deploy/images/pull-grafana.sh +++ b/src/deploy/images/pull-grafana.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ "$DATAFLOW_VERSION" = "" ]; then - DATAFLOW_VERSION=2.11.5-SNAPSHOT + DATAFLOW_VERSION=3.0.0-SNAPSHOT fi docker pull "springcloud/spring-cloud-dataflow-grafana-prometheus:$DATAFLOW_VERSION" diff --git a/src/deploy/images/pull-single-step-batch-job.sh b/src/deploy/images/pull-single-step-batch-job.sh index df3b6b5f8a..a0bf50b520 100755 --- a/src/deploy/images/pull-single-step-batch-job.sh +++ b/src/deploy/images/pull-single-step-batch-job.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ "$DATAFLOW_VERSION" = "" ]; then - DATAFLOW_VERSION=2.11.5-SNAPSHOT + DATAFLOW_VERSION=3.0.0-SNAPSHOT fi docker pull "springcloud/spring-cloud-dataflow-single-step-batch-job:$DATAFLOW_VERSION" diff --git a/src/deploy/images/pull-skipper.sh b/src/deploy/images/pull-skipper.sh index c867043457..45d49c5635 100755 --- a/src/deploy/images/pull-skipper.sh +++ b/src/deploy/images/pull-skipper.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ "$SKIPPER_VERSION" = "" ]; then - SKIPPER_VERSION=2.11.5-SNAPSHOT + SKIPPER_VERSION=3.0.0-SNAPSHOT fi docker pull "springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION" diff --git a/src/deploy/k8s/deploy-scdf.sh b/src/deploy/k8s/deploy-scdf.sh index 3dfbf64da3..89eb8c3a63 100755 --- a/src/deploy/k8s/deploy-scdf.sh +++ b/src/deploy/k8s/deploy-scdf.sh @@ -17,10 +17,10 @@ if [ "$DATAFLOW_PRO_VERSION" = "" ]; then DATAFLOW_PRO_VERSION=1.6.1-SNAPSHOT fi if [ "$DATAFLOW_VERSION" = "" ]; then - export DATAFLOW_VERSION=2.11.5-SNAPSHOT + export DATAFLOW_VERSION=3.0.0-SNAPSHOT fi if [ "$SKIPPER_VERSION" = "" ]; then - export SKIPPER_VERSION=2.11.5-SNAPSHOT + export SKIPPER_VERSION=3.0.0-SNAPSHOT fi case $BROKER in @@ -85,11 +85,11 @@ if [ "$USE_PRO" = "" ]; then fi if [ "$DATAFLOW_VERSION" = "" ]; then - DATAFLOW_VERSION=2.11.5-SNAPSHOT + DATAFLOW_VERSION=3.0.0-SNAPSHOT fi if [ "$SKIPPER_VERSION" = "" ]; then - SKIPPER_VERSION=2.11.5-SNAPSHOT + SKIPPER_VERSION=3.0.0-SNAPSHOT fi YAML_PATH=$(realpath $SCDIR/yaml) diff --git a/src/deploy/k8s/update-scdf.sh b/src/deploy/k8s/update-scdf.sh index 8414270734..886d15873b 100755 --- a/src/deploy/k8s/update-scdf.sh +++ b/src/deploy/k8s/update-scdf.sh @@ -13,10 +13,10 @@ if [ "$DATAFLOW_PRO_VERSION" = "" ]; then DATAFLOW_PRO_VERSION=1.6.1-SNAPSHOT fi if [ "$DATAFLOW_VERSION" = "" ]; then - export DATAFLOW_VERSION=2.11.5-SNAPSHOT + export DATAFLOW_VERSION=3.0.0-SNAPSHOT fi if [ "$SKIPPER_VERSION" = "" ]; then - export SKIPPER_VERSION=2.11.5-SNAPSHOT + export SKIPPER_VERSION=3.0.0-SNAPSHOT fi case $BROKER in diff --git a/src/deploy/k8s/yaml/server-config.yaml b/src/deploy/k8s/yaml/server-config.yaml index 7eb79d1057..84b0706ece 100644 --- a/src/deploy/k8s/yaml/server-config.yaml +++ b/src/deploy/k8s/yaml/server-config.yaml @@ -40,6 +40,7 @@ data: kubernetes: accounts: default: + maximumConcurrentTasks: 100 environmentVariables: 'JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=-1' imagePullPolicy: IfNotPresent imagePullSecret: registry-key diff --git a/src/docker-compose/.env b/src/docker-compose/.env index d8dbd8e0c7..9eb4b9caf8 100644 --- a/src/docker-compose/.env +++ b/src/docker-compose/.env @@ -1,5 +1,5 @@ -DATAFLOW_VERSION=2.11.3-SNAPSHOT -SKIPPER_VERSION=2.11.3-SNAPSHOT +DATAFLOW_VERSION=3.0.0-SNAPSHOT +SKIPPER_VERSION=3.0.0-SNAPSHOT COMPOSE_PROJECT_NAME=scdf COMPOSE_HTTP_TIMEOUT=300 diff --git a/src/docker-compose/docker-compose-dood.yml b/src/docker-compose/docker-compose-dood.yml index 206e7388d6..bb715cddf8 100644 --- a/src/docker-compose/docker-compose-dood.yml +++ b/src/docker-compose/docker-compose-dood.yml @@ -40,7 +40,7 @@ services: - SPRING_CLOUD_DATAFLOW_TASK_PLATFORM_LOCAL_ACCOUNTS_DEFAULT_DOCKER_PORTRANGE_HIGH=61000 # Override the CTR form maven to docker - - SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}${BP_JVM_VERSION:-} + - SPRING_CLOUD_DATAFLOW_TASK_COMPOSEDTASKRUNNER_URI=docker://springcloud/spring-cloud-dataflow-composed-task-runner:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}${BP_JVM_VERSION:-} - SPRING_CLOUD_DATAFLOW_SERVER_URI=${DATAFLOW_URI:-http://dataflow-server:9393} entrypoint: > /bin/sh -c " @@ -77,7 +77,7 @@ services: /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; 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}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}${BP_JVM_VERSION:-}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}' --no-check-certificate --post-data='uri=docker:springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}${BP_JVM_VERSION:-}'; echo 'Docker Stream apps imported'" app-import-task: diff --git a/src/docker-compose/docker-compose-influxdb.yml b/src/docker-compose/docker-compose-influxdb.yml index ced3273820..08c3f9847e 100644 --- a/src/docker-compose/docker-compose-influxdb.yml +++ b/src/docker-compose/docker-compose-influxdb.yml @@ -25,7 +25,7 @@ services: - '8086:8086' grafana: - image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-influxdb:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT} container_name: grafana ports: - '3000:3000' diff --git a/src/docker-compose/docker-compose-kafka.yml b/src/docker-compose/docker-compose-kafka.yml index b5db9984df..dfa6838533 100644 --- a/src/docker-compose/docker-compose-kafka.yml +++ b/src/docker-compose/docker-compose-kafka.yml @@ -72,5 +72,5 @@ services: /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; 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}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-kafka:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}'; echo 'Maven Stream apps imported'" \ No newline at end of file diff --git a/src/docker-compose/docker-compose-prometheus.yml b/src/docker-compose/docker-compose-prometheus.yml index 13b9019f3a..2f142d2074 100644 --- a/src/docker-compose/docker-compose-prometheus.yml +++ b/src/docker-compose/docker-compose-prometheus.yml @@ -36,13 +36,13 @@ services: - micrometer.prometheus-proxy.tcp-port=7001 grafana: - image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT} container_name: grafana ports: - '3000:3000' prometheus: - image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT} + image: springcloud/spring-cloud-dataflow-prometheus-local:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT} container_name: prometheus ports: - '9090:9090' diff --git a/src/docker-compose/docker-compose-rabbitmq.yml b/src/docker-compose/docker-compose-rabbitmq.yml index 6646ce6033..0c8871e171 100644 --- a/src/docker-compose/docker-compose-rabbitmq.yml +++ b/src/docker-compose/docker-compose-rabbitmq.yml @@ -32,5 +32,5 @@ services: /bin/sh -c " ./wait-for-it.sh -t 360 dataflow-server:9393; 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}'; - wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}'; + wget -qO- '${DATAFLOW_URI:-http://dataflow-server:9393}/apps/sink/dataflow-tasklauncher/${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}' --no-check-certificate --post-data='uri=maven://org.springframework.cloud:spring-cloud-dataflow-tasklauncher-sink-rabbit:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}'; echo 'Stream apps imported'" diff --git a/src/docker-compose/docker-compose.yml b/src/docker-compose/docker-compose.yml index 1557b0a0e1..1dd5f96fca 100644 --- a/src/docker-compose/docker-compose.yml +++ b/src/docker-compose/docker-compose.yml @@ -20,7 +20,7 @@ services: dataflow-server: user: root - image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-2.11.3-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:-3.0.0-SNAPSHOT}${BP_JVM_VERSION:-} container_name: dataflow-server ports: - "9393:9393" @@ -61,7 +61,7 @@ services: skipper-server: user: root - image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.11.3-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-3.0.0-SNAPSHOT}${BP_JVM_VERSION:-} container_name: skipper-server ports: - "7577:7577" diff --git a/src/kubernetes/server/server-deployment.yaml b/src/kubernetes/server/server-deployment.yaml index b053b833a2..3ad4da8caa 100644 --- a/src/kubernetes/server/server-deployment.yaml +++ b/src/kubernetes/server/server-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: scdf-server - image: springcloud/spring-cloud-dataflow-server:2.11.3-SNAPSHOT + image: springcloud/spring-cloud-dataflow-server:3.0.0-SNAPSHOT imagePullPolicy: IfNotPresent volumeMounts: - name: config @@ -68,7 +68,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.11.3-SNAPSHOT' + value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:3.0.0-SNAPSHOT' - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API value: 'false' - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API diff --git a/src/kubernetes/skipper/skipper-deployment.yaml b/src/kubernetes/skipper/skipper-deployment.yaml index 7db066e185..61faeb274f 100644 --- a/src/kubernetes/skipper/skipper-deployment.yaml +++ b/src/kubernetes/skipper/skipper-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: skipper - image: springcloud/spring-cloud-skipper-server:2.11.3-SNAPSHOT + image: springcloud/spring-cloud-skipper-server:3.0.0-SNAPSHOT imagePullPolicy: IfNotPresent volumeMounts: - name: config diff --git a/src/local/.env b/src/local/.env new file mode 100644 index 0000000000..f722266adb --- /dev/null +++ b/src/local/.env @@ -0,0 +1,5 @@ + +DATAFLOW_VERSION=3.0.0-SNAPSHOT +SKIPPER_VERSION=3.0.0-SNAPSHOT +COMPOSE_PROJECT_NAME=scdf-local +COMPOSE_HTTP_TIMEOUT=300 diff --git a/src/local/README.md b/src/local/README.md index 34b646c8d4..0af24251b3 100644 --- a/src/local/README.md +++ b/src/local/README.md @@ -10,7 +10,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor *If the timestamp of snapshots matches the download will be skipped.* Usage: `download-apps.sh [version]` -* `version` is the dataflow-server version like `2.10.3`. Default is `2.11.3-SNAPSHOT` +* `version` is the dataflow-server version like `2.10.3`. Default is `3.0.0-SNAPSHOT` ## `launch-dataflow.sh` Uses docker compose to launch a database, broker, skipper and dataflow server. diff --git a/src/local/docker-compose.yml b/src/local/docker-compose.yml index b60506c63c..651918b9df 100644 --- a/src/local/docker-compose.yml +++ b/src/local/docker-compose.yml @@ -35,7 +35,7 @@ services: profiles: - skipper user: root - image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-2.11.3-SNAPSHOT}${BP_JVM_VERSION:-} + image: springcloud/spring-cloud-skipper-server:${SKIPPER_VERSION:-3.0.0-SNAPSHOT}${BP_JVM_VERSION:-} container_name: skipper ports: - "7577:7577" diff --git a/src/local/download-apps.sh b/src/local/download-apps.sh index 6f614ad2b7..5a36edd954 100755 --- a/src/local/download-apps.sh +++ b/src/local/download-apps.sh @@ -10,7 +10,7 @@ ROOT_DIR=$(realpath $SCDIR/../..) if [ "$1" != "" ]; then VER=$1 else - VER=2.11.3-SNAPSHOT + VER=3.0.0-SNAPSHOT fi function download_deps() { diff --git a/src/local/register-apps.sh b/src/local/register-apps.sh index 873e9866db..2828abaace 100755 --- a/src/local/register-apps.sh +++ b/src/local/register-apps.sh @@ -39,8 +39,7 @@ else BROKER_NAME=$BROKER fi if [ "$STREAM_APPS_RT_VERSION" = "" ]; then - export STREAM_APPS_RT_VERSION=2021.1.2 # release for Boot 2.x - # export STREAM_APPS_RT_VERSION=2022.0.0 # release for Boot 3.x apps + export STREAM_APPS_RT_VERSION=2024.0.0 fi echo "STREAM_APPS_RT_VERSION=$STREAM_APPS_RT_VERSION" TYPE=maven @@ -67,12 +66,6 @@ fi echo "DATAFLOW_IP=$DATAFLOW_IP" dataflow_post "uri=$DESCRIPTORS" "$DATAFLOW_IP/apps" -dataflow_post "uri=maven:io.spring:timestamp-task:2.0.2" "$DATAFLOW_IP/apps/task/timestamp/2.0.2" -dataflow_post "uri=maven:io.spring:timestamp-task:3.0.0" "$DATAFLOW_IP/apps/task/timestamp3?bootVersion=3" -dataflow_post "uri=maven:io.spring:timestamp-batch-task:2.0.2" "$DATAFLOW_IP/apps/task/timestamp-batch/2.0.2" -dataflow_post "uri=maven:io.spring:timestamp-batch-task:3.0.0" "$DATAFLOW_IP/apps/task/timestamp-batch3?bootVersion=3" -dataflow_post "uri=maven:io.spring:scenario-task:0.0.1-SNAPSHOT" "$DATAFLOW_IP/apps/task/scenario/0.0.1-SNAPSHOT" -dataflow_post "uri=maven:org.springframework.cloud.dataflow.acceptence.tests:batch-remote-partition:0.0.2-SNAPSHOT" "$DATAFLOW_IP/apps/task/batch-remote-partition/0.0.2-SNAPSHOT" -dataflow_post "uri=maven:org.springframework.cloud.stream.app:log-sink-$BROKER_NAME:3.0.1" "$DATAFLOW_IP/apps/sink/ver-log/3.0.1" -dataflow_post "uri=maven:org.springframework.cloud.stream.app:log-sink-$BROKER_NAME:2.1.5.RELEASE" "$DATAFLOW_IP/apps/sink/ver-log/2.1.5.RELEASE" -dataflow_post "uri=maven:io.spring.task:task-demo-metrics-prometheus:2.0.1-SNAPSHOT" "$DATAFLOW_IP/apps/task/task-demo-metrics-prometheus/2.0.1-SNAPSHOT" +dataflow_post "uri=maven:io.spring:timestamp-task:3.0.0" "$DATAFLOW_IP/apps/task/timestamp" +dataflow_post "uri=maven:io.spring:timestamp-batch-task:3.0.0" "$DATAFLOW_IP/apps/task/timestamp-batch" +