Skip to content

Commit d270ca7

Browse files
author
Corneil du Plessis
committed
[CI] Update carvel documentation
1 parent 2865f61 commit d270ca7

File tree

7 files changed

+54
-37
lines changed

7 files changed

+54
-37
lines changed

‎spring-cloud-dataflow-docs/src/main/asciidoc/configuration-carvel.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ Executing the following script will configure the environmental variables needed
9696

9797
[source,shell]
9898
....
99-
source ./start-deploy.sh <broker> <namespace> [scdf-type] [release\|snapshot]
99+
source ./start-deploy.sh <broker> <namespace> [scdf-type] [release|snapshot]
100100
....
101101

102102
Where:
103103

104104
* `broker` is one of rabbitmq or kafka
105105
* `namespace` A valid Kubernetes namespace other than `default`
106106
* `scdf-type` One of oss or pro. oss is the default.
107-
* `release\|snapshot` and `scdf-type` will determine the value of `PACKAGE_VERSION`.
107+
* `release|snapshot` and `scdf-type` will determine the value of `PACKAGE_VERSION`.
108108

109109

110110
The environmental variables can also be configured manually to override the values.

‎spring-cloud-dataflow-package/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,24 @@
1010
</parent>
1111
<artifactId>spring-cloud-dataflow-package</artifactId>
1212
<packaging>pom</packaging>
13+
<properties>
14+
<package.version>${project.version}</package.version>
15+
<scdf.type.version>oss</scdf.type.version>
16+
</properties>
1317
<build>
1418
<plugins>
19+
<plugin>
20+
<groupId>org.apache.maven.plugins</groupId>
21+
<artifactId>maven-resources-plugin</artifactId>
22+
<version>3.3.1</version>
23+
</plugin>
1524
<plugin>
1625
<groupId>org.apache.maven.plugins</groupId>
1726
<artifactId>maven-assembly-plugin</artifactId>
1827
<version>3.5.0</version>
28+
<configuration>
29+
<finalName>spring-cloud-dataflow-${scdf.type.version}-install-${package.version}</finalName>
30+
</configuration>
1931
<executions>
2032
<execution>
2133
<phase>package</phase>

‎src/deploy/README.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ <h2 id="_prepare_configuration_parameters">Prepare Configuration parameters</h2>
650650
</div>
651651
<div class="listingblock">
652652
<div class="content">
653-
<pre class="CodeRay highlight"><code data-lang="shell">source ./start-deploy.sh &lt;broker&gt; &lt;namespace&gt; [scdf-type] [release\|snapshot]</code></pre>
653+
<pre class="CodeRay highlight"><code data-lang="shell">source ./start-deploy.sh &lt;broker&gt; &lt;namespace&gt; [scdf-type] [release|snapshot]</code></pre>
654654
</div>
655655
</div>
656656
<div class="paragraph">
@@ -668,7 +668,7 @@ <h2 id="_prepare_configuration_parameters">Prepare Configuration parameters</h2>
668668
<p><code>scdf-type</code> One of oss or pro. oss is the default.</p>
669669
</li>
670670
<li>
671-
<p><code>release\|snapshot</code> and <code>scdf-type</code> will determine the value of <code>PACKAGE_VERSION</code>.</p>
671+
<p><code>release|snapshot</code> and <code>scdf-type</code> will determine the value of <code>PACKAGE_VERSION</code>.</p>
672672
</li>
673673
</ul>
674674
</div>
@@ -1311,7 +1311,7 @@ <h4 id="_scripts_2">Scripts</h4>
13111311
</div>
13121312
<div id="footer">
13131313
<div id="footer-text">
1314-
Last updated 2023-05-19 12:34:33 +0200
1314+
Last updated 2023-05-19 15:50:30 +0200
13151315
</div>
13161316
</div>
13171317
</body>

‎src/deploy/README.pdf

-23 Bytes
Binary file not shown.

‎src/deploy/carvel/prepare-cluster.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
bold="\033[1m"
33
dim="\033[2m"
44
end="\033[0m"
5-
CM_VERSION=v1.11.1
6-
SGC_VER=v0.14.2
7-
KC_VER=v0.45.0
5+
CERT_MANAGER_VERSION=v1.11.2
6+
SECRETGEN_CONTROLLER_VERSION=v0.14.3
7+
KAPP_CONTROLLER_VERSION=v0.45.1
88
start_time=$(date +%s)
9-
echo "Deploying cert-manager $CM_VERSION"
9+
echo "Deploying cert-manager $CERT_MANAGER_VERSION"
1010
kapp deploy --yes --wait --wait-check-interval 10s --app cert-manager \
11-
--file https://github.com/cert-manager/cert-manager/releases/download/$CM_VERSION/cert-manager.yaml
12-
echo "Deployed cert-manager $CM_VERSION"
13-
echo "Deploying secretgen-controller $SGC_VER"
11+
--file https://github.com/cert-manager/cert-manager/releases/download/$CERT_MANAGER_VERSION/cert-manager.yaml
12+
echo "Deployed cert-manager $CERT_MANAGER_VERSION"
13+
echo "Deploying secretgen-controller $SECRETGEN_CONTROLLER_VERSION"
1414
kapp deploy --yes --wait --wait-check-interval 10s --app secretgen-controller \
15-
--file https://github.com/carvel-dev/secretgen-controller/releases/download/$SGC_VER/release.yml
15+
--file https://github.com/carvel-dev/secretgen-controller/releases/download/$SECRETGEN_CONTROLLER_VERSION/release.yml
1616
echo "Deployed secretgen-controller"
17-
echo "Deploying kapp-controller $KC_VER"
18-
kapp deploy --yes --wait --wait-check-interval 10s --app kapp-controller --file https://github.com/carvel-dev/kapp-controller/releases/download/$KC_VER/release.yml
17+
echo "Deploying kapp-controller $KAPP_CONTROLLER_VERSION"
18+
kapp deploy --yes --wait --wait-check-interval 10s --app kapp-controller --file https://github.com/carvel-dev/kapp-controller/releases/download/$KAPP_CONTROLLER_VERSION/release.yml
1919
echo "Deployed kapp-controller"
2020
end_time=$(date +%s)
2121
elapsed=$((end_time - start_time))

‎src/deploy/carvel/start-deploy.sh

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
23
bold="\033[1m"
34
dim="\033[2m"
45
end="\033[0m"
@@ -7,36 +8,24 @@ if [ "$sourced" = "0" ]; then
78
echo "This script must be invoked using: source $0 $*"
89
exit 1
910
fi
11+
12+
SCDF_TYPE=$(yq '.default.scdf-type' $SCDIR/versions.yaml)
13+
SCDF_REL=$(yq '.default.version' $SCDIR/versions.yaml)
14+
NS=scdf
1015
if [ "$1" = "" ]; then
1116
echo "Usage: <broker> [scdf-type] [namespace] [release|snapshot]"
1217
echo "Where:"
1318
echo " broker is one of kafka or rabbitmq"
14-
echo " scdf-type is one of oss or pro. The default is 'oss'"
15-
echo " namespace is a valid k8s namespace other than 'default'. The default is 'scdf'."
16-
echo " release or snapshot and scdf-type will determine PACKAGE_VERSION. The default is latest snapshot."
19+
echo " scdf-type is one of oss or pro. The default is '$SCDF_TYPE'"
20+
echo " namespace is a valid k8s namespace other than 'default'. The default is '$NS'."
21+
echo " release or snapshot and scdf-type will determine PACKAGE_VERSION. The default is $SCDF_REL."
1722
return 0
1823
fi
1924

20-
SCDF_TYPE=oss
21-
NS=scdf
22-
2325
while [ "$1" != "" ]; do
2426
case $1 in
25-
"snapshot")
26-
if [ "$SCDF_TYPE" = "oss" ]; then
27-
PACKAGE_VERSION=2.11.0-SNAPSHOT
28-
else
29-
PACKAGE_VERSION=1.6.0-SNAPSHOT
30-
fi
31-
export PACKAGE_VERSION
32-
;;
33-
"release")
34-
if [ "$SCDF_TYPE" = "oss" ]; then
35-
PACKAGE_VERSION=2.10.3
36-
else
37-
PACKAGE_VERSION=1.5.3
38-
fi
39-
export PACKAGE_VERSION
27+
"snapshot" | "release")
28+
SCDF_REL=$1
4029
;;
4130
"rabbitmq" | "rabbit")
4231
BROKER=rabbitmq
@@ -61,7 +50,11 @@ if [ "$BROKER" = "" ]; then
6150
echo "Broker must be provided"
6251
return 0
6352
fi
64-
53+
if [ "$DEBUG" = "true" ]; then
54+
echo "yq '.scdf-type.$SCDF_TYPE.$SCDF_REL' $SCDIR/versions.yaml"
55+
fi
56+
PACKAGE_VERSION="$(yq ".scdf-type.$SCDF_TYPE.$SCDF_REL" "$SCDIR/versions.yaml")"
57+
export PACKAGE_VERSION
6558
export BROKER
6659
export SCDF_TYPE
6760
export NS

‎src/deploy/carvel/versions.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
scdf-type:
2+
oss:
3+
release: '2.10.3'
4+
snapshot: '2.11.0-SNAPSHOT'
5+
ga-snapshot: '2.10.4-SNAPSHOT'
6+
pro:
7+
release: '1.5.3'
8+
snapshot: '1.6.0-SNAPSHOT'
9+
ga-snapshot: '1.5.4-SNAPSHOT'
10+
default:
11+
scdf-type: 'oss'
12+
version: 'snapshot'

0 commit comments

Comments
 (0)