Skip to content

Commit 2b5368c

Browse files
committed
Removing long parameter names from rest sample
1 parent e0b6b0f commit 2b5368c

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ private void generateInputYaml(boolean useLegacyRESTIdentity) throws Exception {
280280
sb.append(TestUtils.getHostName());
281281
sb.append(" >> ");
282282
sb.append(generatedInputYamlFile);
283+
logger.info("Invoking " + sb.toString());
283284
ExecCommand.exec(sb.toString());
284285
}
285286

kubernetes/samples/scripts/rest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ the namespace where the operator will be installed, and optionally the secret na
2020
to `weblogic-operator-external-rest-identity`. Each must be prefaced
2121
by `DNS:` (for a name) or `IP:` (for an address), for example:
2222
```
23-
DNS:myhost,DNS:localhost,IP:127.0.0.1 -n weblogic-operator
23+
DNS:myhost,DNS:localhost,IP:127.0.0.1
2424
```
2525

2626
You should include the addresses of all masters and load balancers in this list. The certificate

kubernetes/samples/scripts/rest/generate-external-rest-identity.sh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#
1414
# The sytax of the script is:
1515
#
16-
# kubernetes/samples/scripts/rest/generate-external-rest-identity.sh <SANs> -n <namespace>
16+
# kubernetes/samples/scripts/rest/generate-external-rest-identity.sh -a <SANs> -n <namespace>
1717
#
1818
# Where <SANs> lists the subject alternative names to put into the generated self-signed
1919
# certificate for the external WebLogic Operator REST https interface, for example:
2020
#
21-
# DNS:myhost,DNS:localhost,IP:127.0.0.1 -n weblogic-operator
21+
# DNS:myhost,DNS:localhost,IP:127.0.0.1
2222
#
2323
# You should include the addresses of all masters and load balancers in this list. The certificate
2424
# cannot be conveniently changed after installation of the operator.
@@ -27,19 +27,18 @@
2727
# certificate and private key
2828
#
2929
# Example usage:
30-
# generate-external-rest-identity.sh IP:127.0.0.1 -n weblogic-operator > my_values.yaml
30+
# generate-external-rest-identity.sh -a IP:127.0.0.1 -n weblogic-operator > my_values.yaml
3131
# echo "externalRestEnabled: true" >> my_values.yaml
3232
# ...
3333
# helm install kubernetes/charts/weblogic-operator --name my_operator --namespace my_operator-ns --values my_values.yaml --wait
3434
usage(){
3535
cat <<EOF
36-
Usage: $0 [options] <subject alternative names> <-n namespace>
36+
Usage: $0 [options] -a <subject alternative names> -n <namespace>
3737
Options:
38-
--subject-alternative-name SANS Required, the SANs for the certificate
39-
-n, --namespace NAMESPACE Required, the namespace where the secret will be created.
40-
-s, --secret-name SECRET_NAME Optional, the name of the kubernetes secret. Default is:
41-
weblogic-operator-external-rest-identity.
42-
-h, --help Display this help text.
38+
-a SANS Required, the SANs for the certificate
39+
-n NAMESPACE Required, the namespace where the secret will be created.
40+
-s SECRET_NAME Optional, the name of the kubernetes secret. Default is: weblogic-operator-external-rest-identity.
41+
-h, --help Display this help text.
4342
EOF
4443
exit 1
4544
}
@@ -88,25 +87,25 @@ while [ $# -gt 0 ]
8887
do
8988
key="$1"
9089
case $key in
91-
--subject-alternative-name)
90+
-a)
9291
shift # past argument
9392
if [ $# -eq 0 ] || [ ${1:0:1} == "-" ]; then echo "SANs is required and is missing"; usage; fi
9493
SANS=$1
9594
shift # past value
9695
;;
97-
-n|--namespace)
96+
-n)
9897
shift # past argument
9998
if [ $# -eq 0 ] || [ ${1:0:1} == "-" ]; then echo "Namespace is required and is missing"; usage; fi
10099
NAMESPACE=$1
101100
shift # past value
102101
;;
103-
-s|--secret-name)
102+
-s)
104103
shift # past argument
105104
if [ $# -eq 0 ] || [ ${1:0:1} == "-" ]; then echo "Invalid secret name $1"; usage; fi
106105
SECRET_NAME=$1
107106
shift # past value
108107
;;
109-
-h|--help)
108+
-h)
110109
shift # past argument
111110
;;
112111
*)

site/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ ___This script should not be used in a production environment (because self-sign
8080

8181
The script takes the subject alternative names that should be added to the certificate, for example, the list of hostnames that clients can use to access the external REST interface, the optional secret name to store the certificate (defaults to weblogic-operator-external-rest-identity) and the namespace where the operator will be installed. In this example, the output is directly appended to your custom YAML configuration:
8282
```
83-
$ kubernetes/samples/scripts/rest/generate-external-rest-identity.sh "DNS:${HOSTNAME},DNS:localhost,IP:127.0.0.1 -n weblogic-operator " >> custom-values.yaml
83+
$ kubernetes/samples/scripts/rest/generate-external-rest-identity.sh -a "DNS:${HOSTNAME},DNS:localhost,IP:127.0.0.1" -n weblogic-operator >> custom-values.yaml
8484
```
8585

8686
## Optional: Elastic Stack (Elasticsearch, Logstash, and Kibana) integration
@@ -328,7 +328,7 @@ Determines whether the operator's REST interface will be exposed outside the Kub
328328

329329
Defaults to `false`.
330330

331-
If set to `true`, you must provide the SSL certificate and private key for the operator's external REST interface by specifying the `externalOperatorCert` and `externalOperatorKey` properties.
331+
If set to `true`, you must provide the `externalRestIdentitySecret` property that contains the name of the Kubernetes secret which contains the SSL certificate and private key for the operator's external REST interface.
332332

333333
Example:
334334
```

0 commit comments

Comments
 (0)