Skip to content

Commit f8ca29c

Browse files
author
Corneil du Plessis
committed
[CI] Improve Carvel docs
1 parent c8ebf3a commit f8ca29c

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ NOTE: Some of these utilities are not installed in macOS or *nix by default but
3232

3333
These scripts assume you are connected to a Kubernetes cluster and `kubectl` is available.
3434

35-
[cols="3m,3,6"]
35+
[cols="3m,3,6a"]
3636
|===
3737
|Name | Arguments |Descriptions
3838

@@ -56,6 +56,17 @@ These scripts assume you are connected to a Kubernetes cluster and `kubectl` is
5656
| <host> <port> [step]
5757
| Configures Spring Boot Actuator properties for Data Flow, Skipper, Streams and Tasks. Default `step` is 10s
5858

59+
| configure-database.sh
60+
| <app> <database> <url> <username/secret-name> [password/secret-username-key] [secret-password-key]
61+
| If only _secret-name_ is provided then _secret-username-key_ defaults to `username` and _secret-password-key_ defaults to `password`.
62+
63+
The following 3 combinations are allowed after the _url_:
64+
65+
* <secret-name>
66+
* <secret-name> <username-key>
67+
<password-key>
68+
* <username> <password>
69+
5970
| deploy-scdf.sh
6071
| [app-name]
6172
| Deploys the application using the package and `scdf-values.yml` in the current directory.

src/deploy/carvel/configure-database.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ fi
55

66
SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
77
if [ "$4" = "" ]; then
8-
echo "<app> <database> <url> <secret-name> [secret-username-key] [secret-password-key]"
8+
echo "<app> <database> <url> <username/secret-name> [password/secret-username-key] [secret-password-key]"
9+
echo " If username / password is provided it will be assigned to the values file."
910
exit 1
1011
fi
1112

0 commit comments

Comments
 (0)