Update docs and script to 2.11.5-SNAPSHOT (#5904)

Corneil du Plessis · web-flow · commit 23a937914d61 · 2024-08-28T09:16:27.000-05:00
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
@@ -139,8 +139,8 @@ This example shows the versions of the current development snapshot.
 
 [source,shell]
 ....
-export DATAFLOW_VERSION=2.11.4-SNAPSHOT
-export SKIPPER_VERSION=2.11.4-SNAPSHOT
+export DATAFLOW_VERSION=2.11.5-SNAPSHOT
+export SKIPPER_VERSION=2.11.5-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/src/deploy/README.html b/src/deploy/README.html
@@ -1280,8 +1280,8 @@ <h6 id="_configure_database">Configure Database</h6>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">export DATAFLOW_VERSION=2.11.4-SNAPSHOT
-export SKIPPER_VERSION=2.11.4-SNAPSHOT</code></pre>
+<pre class="CodeRay highlight"><code data-lang="shell">export DATAFLOW_VERSION=2.11.5-SNAPSHOT
+export SKIPPER_VERSION=2.11.5-SNAPSHOT</code></pre>
 </div>
 </div>
 <div class="paragraph">
diff --git a/src/deploy/carvel/prepare-cluster.sh b/src/deploy/carvel/prepare-cluster.sh
@@ -1,10 +1,33 @@
 #!/usr/bin/env bash
+SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
+K8S=$(realpath $SCDIR/../k8s)
 bold="\033[1m"
 dim="\033[2m"
 end="\033[0m"
 CERT_MANAGER_VERSION=v1.14.2
-SECRETGEN_CONTROLLER_VERSION=v0.17.0
+SECRETGEN_CONTROLLER_VERSION=v0.17.3
 KAPP_CONTROLLER_VERSION=v0.50.0
+wget -q -O cert-manager-release.yml "https://github.com/cert-manager/cert-manager/releases/download/$CERT_MANAGER_VERSION/cert-manager.yaml"
+IMAGES=$(yq '.spec.template.spec.containers | .[] | .image' cert-manager-release.yml)
+for image in $IMAGES; do
+  if [[ "$image" != "---"* ]]; then
+    $K8S/load-image.sh "$image"
+  fi
+done
+wget -q -O secretgen-release.yml "https://github.com/carvel-dev/secretgen-controller/releases/download/$SECRETGEN_CONTROLLER_VERSION/release.yml"
+IMAGES=$(yq '.spec.template.spec.containers | .[] | .image' secretgen-release.yml)
+for image in $IMAGES; do
+  if [[ "$image" != "---"* ]]; then
+    $K8S/load-image.sh "$image"
+  fi
+done
+wget -q -O kapp-controller-release.yml https://github.com/carvel-dev/kapp-controller/releases/download/$KAPP_CONTROLLER_VERSION/release.yml
+IMAGES=$(yq '.spec.template.spec.containers | .[] | .image' kapp-controller-release.yml)
+for image in $IMAGES; do
+  if [[ "$image" != "---"* ]]; then
+    $K8S/load-image.sh "$image"
+  fi
+done
 start_time=$(date +%s)
 echo "Deploying cert-manager $CERT_MANAGER_VERSION"
 kapp deploy --yes --wait --wait-check-interval 10s --app cert-manager \
diff --git a/src/deploy/carvel/register-apps.sh b/src/deploy/carvel/register-apps.sh
@@ -43,10 +43,12 @@ else
     # unfortunately different in docker image names and registration link.
     BROKER_NAME=rabbitmq
 fi
-
 if [ "$STREAM_APPS_RT_VERSION" = "" ]; then
-    STREAM_URI="https://dataflow.spring.io/$BROKER_NAME-${TYPE}-latest"
-elif [[ "$STREAM_APPS_RT_VERSION" = *"SNAPSHOT"* ]]; 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
+fi
+echo "STREAM_APPS_RT_VERSION=$STREAM_APPS_RT_VERSION"
+if [[ "$STREAM_APPS_RT_VERSION" = *"SNAPSHOT"* ]]; then
     STREAM_APPS_DL_VERSION=$STREAM_APPS_RT_VERSION
     META_DATA="https://repo.spring.io/snapshot/org/springframework/cloud/stream/app/stream-applications-descriptor/${STREAM_APPS_RT_VERSION}/maven-metadata.xml"
     echo "Downloading $META_DATA"
@@ -72,16 +74,6 @@ fi
 echo "Registering Stream applications at $DATAFLOW_URL using $STREAM_URI"
 wget -qO- $DATAFLOW_URL/apps --post-data="uri=$STREAM_URI"
 
-# replace with individual invocations of register_app for only those applications used.
-#register_app "source/file" "docker:springcloudstream/file-source-$BROKER_NAME:3.2.1"
-#register_app "source/ftp" "docker:springcloudstream/ftp-source-$BROKER_NAME:3.2.1"
-#register_app "processor/aggregator" "docker:springcloudstream/aggregator-processor-$BROKER_NAME:3.2.1"
-#register_app "processor/filter" "docker:springcloudstream/filter-processor-$BROKER_NAME:3.2.1"
-#register_app "processor/groovy" "docker:springcloudstream/groovy-processor-$BROKER_NAME:3.2.1"
-#register_app "processor/script" "docker:springcloudstream/script-processor-$BROKER_NAME:3.2.1"
-#register_app "processor/splitter" "docker:springcloudstream/splitter-processor-$BROKER_NAME:3.2.1"
-#register_app "processor/transform" "docker:springcloudstream/transform-processor-$BROKER_NAME:3.2.1"
-
 TASK_URI=https://dataflow.spring.io/task-${TYPE}-latest
 echo "Registering Task applications at $DATAFLOW_URL using $TASK_URI"
 wget -qO- "$DATAFLOW_URL/apps" --post-data="uri=$TASK_URI"
diff --git 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.4-SNAPSHOT
+  DATAFLOW_VERSION=2.11.5-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
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "$DATAFLOW_VERSION" = "" ]; then
-  DATAFLOW_VERSION=2.11.4-SNAPSHOT
+  DATAFLOW_VERSION=2.11.5-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
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "$DATAFLOW_VERSION" = "" ]; then
-  DATAFLOW_VERSION=2.11.4-SNAPSHOT
+  DATAFLOW_VERSION=2.11.5-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
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "$DATAFLOW_VERSION" = "" ]; then
-  DATAFLOW_VERSION=2.11.4-SNAPSHOT
+  DATAFLOW_VERSION=2.11.5-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
@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "$SKIPPER_VERSION" = "" ]; then
-  SKIPPER_VERSION=2.11.4-SNAPSHOT
+  SKIPPER_VERSION=2.11.5-SNAPSHOT
 fi
 
 docker pull "springcloud/spring-cloud-skipper-server:$SKIPPER_VERSION"
diff --git a/src/deploy/k8s/configure-k8s.sh b/src/deploy/k8s/configure-k8s.sh
@@ -22,7 +22,7 @@ if [ "$1" != "" ]; then
     export K8S_VERSION="$1"
 else
     if [ "$K8S_VERSION" == "" ]; then
-        export K8S_VERSION="1.28"
+        export K8S_VERSION="1.30"
     fi
 fi
 set +e
diff --git 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.4-SNAPSHOT
+  export DATAFLOW_VERSION=2.11.5-SNAPSHOT
 fi
 if [ "$SKIPPER_VERSION" = "" ]; then
-  export SKIPPER_VERSION=2.11.4-SNAPSHOT
+  export SKIPPER_VERSION=2.11.5-SNAPSHOT
 fi
 
 case $BROKER in
@@ -85,11 +85,11 @@ if [ "$USE_PRO" = "" ]; then
 fi
 
 if [ "$DATAFLOW_VERSION" = "" ]; then
-    DATAFLOW_VERSION=2.11.4-SNAPSHOT
+    DATAFLOW_VERSION=2.11.5-SNAPSHOT
 fi
 
 if [ "$SKIPPER_VERSION" = "" ]; then
-    SKIPPER_VERSION=2.11.4-SNAPSHOT
+    SKIPPER_VERSION=2.11.5-SNAPSHOT
 fi
 
 YAML_PATH=$(realpath $SCDIR/yaml)
diff --git a/src/deploy/k8s/load-images.sh b/src/deploy/k8s/load-images.sh
@@ -18,9 +18,9 @@ case $BROKER in
 esac
 if [ "$STREAM_APPS_VERSION" == "" ]; then
     if [[ "$DATAFLOW_VERSION" == *"SNAPSHOT"* ]]; then
-        STREAM_APPS_VERSION="4.0.0-SNAPSHOT"
+        STREAM_APPS_VERSION="5.0.1-SNAPSHOT"
     else
-        STREAM_APPS_VERSION="4.0.0"
+        STREAM_APPS_VERSION="5.0.0"
     fi
 fi
 
diff --git a/src/deploy/k8s/register-apps.sh b/src/deploy/k8s/register-apps.sh
@@ -44,10 +44,8 @@ else
     BROKER_NAME=$BROKER
 fi
 if [ "$STREAM_APPS_RT_VERSION" = "" ]; then
-    # export STREAM_APPS_RT_VERSION=2022.0.0-SNAPSHOT
-    # 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
-    export STREAM_APPS_RT_VERSION=2022.0.0
+    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
 fi
 echo "STREAM_APPS_RT_VERSION=$STREAM_APPS_RT_VERSION"
 if [ "$PLATFORM_TYPE" != "kubernetes" ]; then
diff --git 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.4-SNAPSHOT
+  export DATAFLOW_VERSION=2.11.5-SNAPSHOT
 fi
 if [ "$SKIPPER_VERSION" = "" ]; then
-  export SKIPPER_VERSION=2.11.4-SNAPSHOT
+  export SKIPPER_VERSION=2.11.5-SNAPSHOT
 fi
 
 case $BROKER in
diff --git a/src/deploy/shell/register-apps.sh b/src/deploy/shell/register-apps.sh
@@ -5,14 +5,20 @@ if [ -z "$BASH_VERSION" ]; then
 fi
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
+if [ "$BROKER" == "rabbitmq" ]; then
+    BROKER_NAME=rabbit
+else
+    BROKER_NAME=$BROKER
+fi
+
 cat > $SCDIR/register-apps.shell <<EOF
 app register --uri docker:springcloudtask/timestamp-task:2.0.2 --name timestamp --type task --force
 app register --uri docker:springcloudtask/timestamp-batch-task:2.0.2 --name timestamp-batch --type task --force
 app register --uri docker:springcloudtask/timestamp-task:3.0.0 --name timestamp3 --bootVersion 3 --type task --force
 app register --uri docker:springcloudtask/timestamp-batch-task:3.0.0 --name timestamp-batch3 --bootVersion 3 --type task --force
 app register --uri docker:springcloudtask/task-demo-metrics-prometheus:2.0.1-SNAPSHOT --name task-demo-metrics-prometheus --type task --force
-app register --uri docker:springcloudstream/time-source-rabbit:4.0.0-RC2 --name time --bootVersion 3 --type source --force
-app register --uri docker:springcloudstream/log-sink-rabbit:4.0.0-RC2 --name log --bootVersion 3 --type sink --force
+app register --uri docker:springcloudstream/time-source-${BROKER_NAME}:5.0.0 --name time --bootVersion 3 --type source --force
+app register --uri docker:springcloudstream/log-sink-${BROKER_NAME}:5.0.0 --name log --bootVersion 3 --type sink --force
 EOF
 
 "$SCDIR/shell.sh" --spring.shell.commandFile=$SCDIR/register-apps.shell
diff --git a/src/deploy/versions.yaml b/src/deploy/versions.yaml
@@ -1,14 +1,14 @@
 scdf-type:
   oss:
-    release: '2.11.3'
-    snapshot: '2.11.4-SNAPSHOT'
+    release: '2.11.4'
+    snapshot: '2.11.5-SNAPSHOT'
     milestone: '2.11.0-RC1'
     maintenance-snapshot: '2.10.4-SNAPSHOT'
   pro:
-    release: '1.6.2'
-    snapshot: '1.6.3-SNAPSHOT'
+    release: '1.6.3'
+    snapshot: '1.6.4-SNAPSHOT'
     maintenance-snapshot: '1.5.4-SNAPSHOT'
 default:
   scdf-type: 'oss'
   version: 'snapshot'
-  package-version: '2.11.4-SNAPSHOT'
+  package-version: '2.11.5-SNAPSHOT'
diff --git a/src/kubernetes/grafana/grafana-deployment.yaml b/src/kubernetes/grafana/grafana-deployment.yaml
@@ -14,7 +14,7 @@ spec:
         app: grafana
     spec:
       containers:
-        - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.11.3-SNAPSHOT
+        - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.11.4
           name: grafana
           env:
             - name: GF_SECURITY_ADMIN_USER
diff --git a/src/local/register-apps.sh b/src/local/register-apps.sh
@@ -39,9 +39,8 @@ else
     BROKER_NAME=$BROKER
 fi
 if [ "$STREAM_APPS_RT_VERSION" = "" ]; then
-    export STREAM_APPS_RT_VERSION=2022.0.0
-    # 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
+    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
 fi
 echo "STREAM_APPS_RT_VERSION=$STREAM_APPS_RT_VERSION"
 TYPE=maven
