Skip to content

Commit 7b3fec0

Browse files
committed
Update based on review comments
1 parent ee6cdca commit 7b3fec0

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ To remove more than one operator, repeat these steps for each operator namespace
193193

194194
# Recent Changes
195195

196-
See [Recent changes](site/recent-changes.md) for recent changes to the weblogic operator, including any backwards incompatible changes.
196+
See [Recent changes](site/recent-changes.md) for recent changes to the operator, including any backwards incompatible changes.
197197

198198

199199
# Developer guide

kubernetes/internal/generate-weblogic-operator-cert.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ OP_KEY_PEM="${CERT_DIR}/${OP_PREFIX}.key.pem"
4040
rm -rf ${CERT_DIR}
4141
mkdir ${CERT_DIR}
4242

43-
# TBD - validate that keytool and openssl are available
44-
# should we import utility.sh so that we can call its 'fail' function?
45-
4643
# generate a keypair for the WebLogic Operator, putting it in a keystore
4744
keytool \
4845
-genkey \

site/creating-domain.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ The following parameters must be provided in the input file:
119119
| t3ChannelPort | Port for the T3Channel of the NetworkAccessPoint. | 30012 |
120120
| t3PublicAddress | Public address for the t3 channel. | kubernetes |
121121
| weblogicCredentialsSecretName | Name of the Kubernetes secret for the Administration Server's username and password. | domain1-weblogic-credentials |
122-
| weblogicDomainStoragePath | Physical path of the storage for the weblogic domain. | no default |
123-
| weblogicDomainStorageSize | Total storage allocated for weblogic domain. | 10Gi |
124-
| weblogicDomainStorageType | Type of storage for the weblogic domain. Legal values are 'NFS' and 'HOST_PATH". | HOST_PATH |
125-
| weblogicDomainStorageNFSServer| The name of ip address of the NFS server for the weblogic domain's storage. | no default |
122+
| weblogicDomainStoragePath | Physical path of the storage for the domain. | no default |
123+
| weblogicDomainStorageSize | Total storage allocated for the domain. | 10Gi |
124+
| weblogicDomainStorageType | Type of storage for the domain. Legal values are 'NFS' and 'HOST_PATH". | HOST_PATH |
125+
| weblogicDomainStorageNFSServer| The name of IP address of the NFS server for the domain's storage. | no default |
126126
| weblogicImagePullSecretName | Name of the Kubernetes secret for the Docker Store, used to pull the WebLogic Server image. | docker-store-secret |
127127

128128
You must uncomment and customize `domainUID` and `weblogicDomainStoratePath`.
@@ -140,7 +140,7 @@ Oracle intends to remove these limitations in a future release.
140140

141141
At this point, you've created a customized copy of the inputs file.
142142

143-
Next, choose and create a directory that generated weblogic operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
143+
Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
144144

145145
Finally, run the create script, pointing it at your inputs file and output directory:
146146

site/developer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ These tests assume that the RBAC definitions exist on the Kubernetes cluster.
7777

7878
To create them, first, make a copy of the inputs file (`create-weblogic-operator-inputs.yaml`) and update it.
7979

80-
Next, choose and create a directory that generated weblogic operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
80+
Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
8181

8282
Finally, run the operator installation script with the "generate only" option as shown below, pointing it at your inputs file and your output directory. (see the [installation](installation.md) page for details about this script and the inputs):
8383

@@ -129,7 +129,7 @@ Verify that you have the right image by running `docker images | grep webloogic-
129129

130130
To create and deploy the operator, first, make a copy of the inputs file (`create-weblogic-operator-inputs.yaml`) and update it, making sure that `weblogicOperatorImagePullPolicy` is set to `Never` and `weblogicOperatorImage` matches the name you used in your `docker build` command.
131131

132-
Next, choose and create a directory that generated weblogic operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
132+
Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
133133

134134
Finally, run the operator installation script to deploy the operator, pointing it at your inputs file and your output directory:
135135

@@ -157,7 +157,7 @@ This project has adopted the following coding standards:
157157
This project has the following directory structure:
158158

159159
* docs: Generated javadoc and swagger
160-
* kubernetes: BASH scripts and yaml templates for operator installation and WebLogic domain creation job.
160+
* kubernetes: BASH scripts and YAML templates for operator installation and WebLogic domain creation job.
161161
* site: This documentation
162162
* src/main/java: Java source code for the operator
163163
* src/test/java: Java unit-tests for the operator

site/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ To enable the ELK integration, set the `elkIntegrationEnabled` option to `true`.
121121

122122
At this point, you've created a custom inputs file, or you've decided to use the default one.
123123

124-
Next, choose and create a directory that generated weblogic operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
124+
Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory.
125125

126126
Finally, run the operator installation script to deploy the operator, pointing it at your inputs file and your output directory:
127127

site/manually-creating-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The `create-weblogic-domain.sh` script described in the previous section can be
1515

1616
First, make a copy of `create-weblogic-domain-inputs.yaml` and customize it.
1717

18-
Next, choose and create a directory that generated weblogic operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory
18+
Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory
1919

2020
Then, execute the script, pointing it at your inputs file and output directory:
2121

site/name-changes.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ The initial version of the WebLogic Server Kubernetes Operator did not use consi
55
We've recently addressed this by:
66
* standardizing the names of scripts and input files for creating operators and domains
77
* standardizing the input parameter names and values
8-
* standardizing the names of the generated yaml files
9-
* requiring that the custom create and specify a directory that the operators' and domains' generated yaml files will be stored in
8+
* standardizing the names of the generated YAML files
9+
* requiring that the customer create and specify a directory that the operators' and domains' generated YAML files will be stored in
1010

1111
This changes how operators and domains are created, and also changes the generated artifacts for operators and domains.
1212

@@ -30,8 +30,8 @@ The following files are used to create the operator and to create and delete dom
3030

3131
### Generated YAML Files for Operators and Domains
3232

33-
The create scripts generate a number of yaml files that are used to configure the corresponding Kubernetes artifacts for the operator and the domains.
34-
Normally, customers do not use these yaml files. However, customers can look at them. They can also change the operator and domain configuration by editing these files and reapplying them.
33+
The create scripts generate a number of YAML files that are used to configure the corresponding Kubernetes artifacts for the operator and the domains.
34+
Normally, customers do not use these YAML files. However, customers can look at them. They can also change the operator and domain configuration by editing these files and reapplying them.
3535

3636
#### Directory for the Generated YAML Files
3737

@@ -43,15 +43,19 @@ The customer must create a directory that will parent the per-operator and per-d
4343
The pathname can either be a full path name, or a relative path name. If it's a relative pathname, then it's relative to the directory of the shell invoking the create script.
4444

4545
The per-operator directory name is:
46-
<user project dir from -o>/weblogic-operators/<operator namespace from the input yaml file's namespace property>
46+
<user project dir from -o>/weblogic-operators/<operator namespace from the input YAML file's namespace property>
4747

4848
Similarly, the per-domain directory name is:
49-
<user project dir from -o>/weblogic-domains/<domain uid from the input yaml file's domainUid property>
49+
<user project dir from -o>/weblogic-domains/<domain uid from the input YAML file's domainUid property>
5050

5151
#### What If I Mess Up Creating a Domain or Operator And Want To Do It Again?
5252

53-
* TBD - destroy the operator / domain - I don't think we provide scripts for this yet, but will soon
54-
* either remove the directory that was generated for that operator / domain, or remove the generated yaml files and the copy of the input file from it
53+
* Remove the resources that were created for the operator:
54+
* kubectl delete -f weblogic-operator.yaml
55+
* kubectl delete -f weblogic-operator-security.yaml
56+
* Remove the resources that were created for the domain:
57+
* kubernetes/delete-weblogic-domain-resources.sh <domainUID>
58+
* either remove the directory that was generated for that operator / domain, or remove the generated YAML files and the copy of the input file from it
5559
* make whatever changes you need in your inputs file
5660
* re-run the create script
5761

@@ -65,7 +69,7 @@ If -i is not specified, kubernetes/create-weblogic-operator.sh uses kubernetes/c
6569

6670
Previously, kubernetes/create-domain-job.sh used kubernetes/create-domain-job-inputs.yaml as the input file if -i was not specified. This behavior has been changed. The customer must select a Kubernetes cluster wide unique id for the domain and set the domainUid property in the inputs file to that value. This means that the customer must always modify the inputs file.
6771

68-
Also, we do not want the customer to have to change files in the weblogic operator's install directory. Because of this, the -i option MUST be specified when calling kubernetes/create-weblogic-operator.sh. The basic flow is:
72+
Also, we do not want the customer to have to change files in the operator's install directory. Because of this, the -i option MUST be specified when calling kubernetes/create-weblogic-operator.sh. The basic flow is:
6973

7074
* pick a user projects directory, e.g. /scratch/my-user-projects
7175
* mkdir /scratch/my-user-projects

0 commit comments

Comments
 (0)