Skip to content

Commit dc98345

Browse files
committed
updates from review comments
1 parent 9f12c7e commit dc98345

File tree

6 files changed

+28
-33
lines changed

6 files changed

+28
-33
lines changed

docs-source/content/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ draft: false
88

99
| Date | Version | Introduces backward incompatibilities | Change |
1010
| --- | --- | --- | --- |
11-
| TBD | v2.2 | no | Add support for FMW Infrastructure domains. If servers are manually shutdown, for example using the console, the operator will return them to the desired state specified in the domain custom resource. Operator is now built and runs on JDK 11.
11+
| TBD | v2.2 | no | Added support for FMW Infrastructure domains. If servers are manually shutdown, for example using the WLS Console, the operator will return them to the desired state specified in the domain custom resource. Operator is now built and runs on JDK 11.
1212
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1313
| March 4, 2019 | v2.0.1 | no | OpenShift support is now certified. Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.
1414
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.

docs-source/content/samples/simple/domains/fmw-domain/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,24 @@ The following parameters can be provided in the inputs file.
115115
| `exposeAdminT3Channel` | Boolean indicating if the T3 administrative channel is exposed outside the Kubernetes cluster. | `false` |
116116
| `image` | WebLogic Docker image. The operator requires FMW Infrastructure 12.2.1.3.0 with patch 29135930 applied. Refer to [FMW Infrastructure domains]({{< relref "/userguide/managing-domains/fmw-infra/_index.md" >}}) for details on how to obtain or create the image. | `oracle/fmw-infrastructure:12.2.1.3` |
117117
| `imagePullPolicy` | WebLogic Docker image pull policy. Legal values are `IfNotPresent`, `Always`, or `Never` | `IfNotPresent` |
118-
| `imagePullSecretName` | Name of the Kubernetes secret to access the Docker Store to pull the WebLogic Server Docker image. The presence of the secret will be validated when this parameter is specified | |
118+
| `imagePullSecretName` | Name of the Kubernetes secret to access the Docker Store to pull the WebLogic Server Docker image. The presence of the secret will be validated when this parameter is specified. | |
119119
| `includeServerOutInPodLog` | Boolean indicating whether to include the server .out to the pod's stdout. | `true` |
120120
| `initialManagedServerReplicas` | Number of Managed Servers to initially start for the domain. | `2` |
121121
| `javaOptions` | Java options for starting the Administration and Managed Servers. A Java option can have references to one or more of the following pre-defined variables to obtain WebLogic domain information: `$(DOMAIN_NAME)`, `$(DOMAIN_HOME)`, `$(ADMIN_NAME)`, `$(ADMIN_PORT)`, and `$(SERVER_NAME)`. | `-Dweblogic.StdoutDebugEnabled=false` |
122122
| `logHome` | The in-pod location for domain log, server logs, server out, and Node Manager log files. If not specified, the value is derived from the `domainUID` as `/shared/logs/<domainUID>`. | `/shared/logs/domain1` |
123123
| `managedServerNameBase` | Base string used to generate Managed Server names. | `managed-server` |
124124
| `managedServerPort` | Port number for each Managed Server. | `8001` |
125125
| `namespace` | Kubernetes namespace in which to create the domain. | `default` |
126-
| `persistentVolumeClaimName` | Name of the persistent volume claim. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-sample-pvc` | `domain1-weblogic-sample-pvc` |
126+
| `persistentVolumeClaimName` | Name of the persistent volume claim. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-sample-pvc`. | `domain1-weblogic-sample-pvc` |
127127
| `productionModeEnabled` | Boolean indicating if production mode is enabled for the domain. | `true` |
128128
| `serverStartPolicy` | Determines which WebLogic Servers will be started up. Legal values are `NEVER`, `IF_NEEDED`, `ADMIN_ONLY`. | `IF_NEEDED` |
129129
| `t3ChannelPort` | Port for the T3 channel of the NetworkAccessPoint. | `30012` |
130130
| `t3PublicAddress` | Public address for the T3 channel. This should be set to the public address of the Kubernetes cluster. This would normally be a load balancer address. <p/>For development environments only: In a single server (all-in-one) Kubernetes deployment, this may be set to the address of the master, or at the very least, it must be set to the address of one of the worker nodes. | If not provided, the script will attempt to set it to the IP address of the Kubernetes cluster |
131-
| `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's user name and password. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-credentials`. | `domain1-weblogic-credentials` |
131+
| `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's user name and password. If not specified, then the value is derived from the `domainUID` as `<domainUID>-weblogic-credentials`. | `domain1-weblogic-credentials` |
132132
| `weblogicImagePullSecretName` | Name of the Kubernetes secret for the Docker Store, used to pull the WebLogic Server image. | `docker-store-secret` |
133133
| `rcuSchemaPrefix` | The schema prefix to use in the database, for example `SOA1`. You may wish to make this the same as the domainUID in order to simplify matching domains to their RCU schemas. | `domain1` |
134134
| `rcuDatabaseURL` | The database URL. | `database:1521/service` |
135-
| `rcuCredentialsSecret` | The kubernetes secret containing the database credentials. | `domain1-rcu-credentials` |
135+
| `rcuCredentialsSecret` | The Kubernetes secret containing the database credentials. | `domain1-rcu-credentials` |
136136
137137
Note that the names of the Kubernetes resources in the generated YAML files may be formed with the
138138
value of some of the properties specified in the `create-inputs.yaml` file. Those properties include

docs-source/content/userguide/managing-domains/fmw-infra/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ to use this image with the operator. A [sample](https://github.com/oracle/docke
6464
is provided that demonstrates how to create a Docker image with the necessary patch installed.
6565

6666
After downloading the patch from My Oracle Support, you can create the patched image
67-
buy running the provided script:
67+
by running the provided script:
6868

6969
TODO TODO TODO check with monica's sample to ensure this is correct TODO TODO TODO
7070

@@ -76,7 +76,7 @@ cd docker-images/OracleFMWInfrastructure/samples/12213-patch-fmw-for-k8s
7676
This will produce an image named `TODO TODO TODO monica what is it called TODO TODO TODO`.
7777

7878
These sample will allow you to create a Docker image containing the FMW Infrastructure
79-
binaries and the necessary patch. You can use this image to run Repository Creation Utility
79+
binaries and the necessary patch. You can use this image to run the Repository Creation Utility
8080
and to run your domain using the "domain on a persistent volume" model. If you want to use
8181
the "domain in a Docker image" model, you will need to go one step further and add another
8282
layer with your domain in it. You can use WLST or WDT to create your domain.
@@ -257,7 +257,7 @@ kubectl run rcu -ti --image oracle/fmw-infrastructure:12.2.1.3 -- sleep 100000
257257

258258
This will create a Kubernetes deployment called `rcu` containing a pod running a container
259259
created from the `oracle/fmw-infrastructure:12.2.1.3` image which will just run
260-
`sleep 100000`, which essentially creates us a pod that we can "exec" into and use to run whatever
260+
`sleep 100000`, which essentially creates a pod that we can "exec" into and use to run whatever
261261
commands we need to run.
262262

263263
To get inside this container and run commands, use this command:
@@ -279,7 +279,7 @@ like WLST.
279279

280280
##### Creating schemas
281281

282-
Inside this pod, you can use the following command to run RCU in command line (no GUI) mode
282+
Inside this pod, you can use the following command to run RCU in command-line (no GUI) mode
283283
to create your FMW schemas. You will need to provide the right prefix and connect string.
284284
You will be prompted to enter the password for the `sys` user, and then the password to use
285285
for the regular schema users:

kubernetes/samples/scripts/create-fmw-infrastructure-domain/create-domain-inputs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ managedServerPort: 8001
4141
# The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied.
4242
# The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019,
4343
# and has all the necessary patches applied; a `docker pull` is required if you already have this image.
44-
# Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
45-
# to obtain or create the image.
44+
# Refer to https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/fmw-infra/
45+
# for details on how to obtain or create the image.
4646
image: oracle/fmw-infrastructure:12.2.1.3
4747

4848
# Image pull policy

kubernetes/samples/scripts/create-rcu-credentials/README.md

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,23 @@ The parameters are as follows:
3333

3434
This creates a `generic` secret containing the user name and password as literal values.
3535

36-
You can check the secret with the `kubectl get secret` command. An example is shown below,
36+
You can check the secret with the `kubectl describe secret` command. An example is shown below,
3737
including the output:
3838

3939
```
40-
$ kubectl -n domain-namespace-1 get secret domain1-rcu-credentials -o yaml
41-
apiVersion: v1
42-
data:
43-
password: d2VsY29tZTE=
44-
username: d2VibG9naWM=
45-
sys_username: c3lz
46-
username: c29hMQ==
47-
kind: Secret
48-
metadata:
49-
creationTimestamp: 2018-12-12T20:25:20Z
50-
labels:
51-
weblogic.domainName: domain1
52-
weblogic.domainUID: domain1
53-
name: domain1-rcu-credentials
54-
namespace: domain-namespace-1
55-
resourceVersion: "5680"
56-
selfLink: /api/v1/namespaces/domain-namespace-1/secrets/domain1-weblogic-credentials
57-
uid: 0c2b3510-fe4c-11e8-994d-00001700101d
58-
type: Opaque
59-
40+
$ kubectl -n domain-namespace-1 describe secret domain1-rcu-credentials -o yaml
41+
Name: domain1-rcu-credentials
42+
Namespace: default
43+
Labels: weblogic.domainName=domain1
44+
weblogic.domainUID=domain1
45+
Annotations: <none>
46+
47+
Type: Opaque
48+
49+
Data
50+
====
51+
password: 12 bytes
52+
sys_password: 12 bytes
53+
sys_username: 3 bytes
54+
username: 4 bytes
6055
```

kubernetes/samples/scripts/create-rcu-credentials/create-rcu-credentials.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44
#
55
# Description
6-
# This sample script creates a Kubernetes secret for WebLogic domain admin credentials.
6+
# This sample script creates a Kubernetes secret for RCU credentials.
77
#
88
# The following pre-requisites must be handled prior to running this script:
99
# * The kubernetes namespace must already be created

0 commit comments

Comments
 (0)