Merge branch 'develop' into sitconfigtests2

Author: sankarpn

docs-source/README.md

@@ -0,0 +1,7 @@
+# Oracle WebLogic Server Kubernetes Operator Documentation
+
+***
+For information on updating and contributing to the operator
+documentation, see the _Documentation_ section of the
+[Developer Guide](https://oracle.github.io/weblogic-kubernetes-operator/developerguide/documentation)
+***

docs-source/content/developerguide/documentation.md

@@ -24,6 +24,10 @@ update to the documentation, follow this process:
 
 3. Make your documentation updates by editing the source files in 
 `docs-source/content`.
+{{% notice note %}}
+Make sure you only check in the changes from the `docs-source/content` area;
+do not build the site and check in the static files.
+{{% /notice %}}
 
 4. If you wish to view your changes you can run the site locally using 
 these commands; the site will be available on the URL shown here:
@@ -38,7 +42,3 @@ and submit a pull request. Remember to follow the guidelines in the
 [CONTRIBUTING](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/CONTRIBUTING.md)
 document.
 
-{{% notice note %}}
-Make sure you only check in your source code changes in `docs-source`; do 
-not build the site and check in the static files.
-{{% /notice %}}

docs-source/content/quickstart/cleanup.md

@@ -13,7 +13,7 @@ weight: 7
     ```bash
     $ helm delete --purge sample-domain1-ingress
     ```
-1.	Remove the domain resources by using the sample [`delete-weblogic-domain-resources`](http://github.com/oracle/weblogic-kubernetes-operator/blob/master/kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh) script.
+1.	Remove the domain resources by using the sample [`delete-weblogic-domain-resources`](http://github.com/oracle/weblogic-kubernetes-operator/blob/master/kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh) script:
 
     ```bash
     $ kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh -d sample-domain1

docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

@@ -59,9 +59,9 @@ The script will perform the following steps:
 * Build a Docker image based on the Docker sample, [Example Image with a WebLogic Server Domain using the Oracle WebLogic Scripting Tooling (WLST)](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image) or [Example Image with a WebLogic Server Domain using the Oracle WebLogic Deploy Tooling (WDT)](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image-wdt). It will create a sample WebLogic Server domain in the Docker image.
   {{% notice warning %}}
   Oracle strongly recommends storing the image containing the domain home as private
-  in the registry (e.g. Oracle Cloud Infrastructure Registry, Docker Hub, etc.) as
+  in the registry (for example, Oracle Cloud Infrastructure Registry, Docker Hub, and such) as
   this image contains sensitive information about the domain including keys and
-  credentials that are used to access external resources (e.g. datasource password).
+  credentials that are used to access external resources (for example, data source password).
   For more information about
   [domain home in image protection]({{<relref "/security/domain-security/image-protection.md#weblogic-domain-in-docker-image-protection">}}),
   see the ***Security*** section.

docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

@@ -103,8 +103,8 @@ The following parameters can be provided in the inputs file.
 | `productionModeEnabled` | Boolean indicating if production mode is enabled for the domain. | `true` |
 | `serverStartPolicy` | Determines which WebLogic Servers will be started up. Legal values are `NEVER`, `IF_NEEDED`, `ADMIN_ONLY`. | `IF_NEEDED` |
 | `t3ChannelPort` | Port for the T3 channel of the NetworkAccessPoint. | `30012` |
-| `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 |
-| `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's username and password. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-credentials`. | `domain1-weblogic-credentials` |
+| `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 |
+| `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` |
 | `weblogicImagePullSecretName` | Name of the Kubernetes secret for the Docker Store, used to pull the WebLogic Server image. | `docker-store-secret` |
 
 Note that the names of the Kubernetes resources in the generated YAML files may be formed with the value of some of the properties specified in the `create-inputs.yaml` file. Those properties include the `adminServerName`, `clusterName` and `managedServerNameBase`. If those values contain any characters that are invalid in a Kubernetes service name, those characters are converted to valid values in the generated YAML files. For example, an uppercase letter is converted to a lowercase letter and an underscore `("_")` is converted to a hyphen `("-")`.

docs-source/content/samples/simple/storage/_index.md

@@ -14,7 +14,7 @@ A PV and PVC can be shared by multiple WebLogic domains or dedicated to a partic
 
 #### Prerequisites
 
-Please read the [Persistent storage]({{< relref "/userguide/managing-domains/persistent-storage/_index.md" >}}) document before proceeding.
+Before you begin, read this document, [Persistent storage]({{< relref "/userguide/managing-domains/persistent-storage/_index.md" >}}).
 
 #### Using the scripts to create a PV and PVC  
 
@@ -60,7 +60,7 @@ The PV and PVC creation inputs can be customized by editing the `create-pv-pvc-i
 | `domainUID` | ID of the domain resource to which the generated PV and PVC will be dedicated. Leave it empty if the PV and PVC are going to be shared by multiple domains. | no default |
 | `namespace` | Kubernetes namespace to create the PVC. | `default` |
 | `baseName` | Base name of the PV and PVC. The generated PV and PVC will be `<baseName>-pv` and `<baseName>-pvc` respectively. | `weblogic-sample` |
-| `weblogicDomainStoragePath` | Physical path of the storage for the PV.  When `weblogicDomainStorageType` is set to `HOST_PATH`, this value should be set the to path to the domain storage on the Kubernetes host.  When `weblogicDomainStorageType` is set to NFS, then `weblogicDomainStorageNFSServer` should be set to the IP address or name of the DNS server, and this value should be set to the exported path on that server.  Note that the path where the domain is mounted in the WebLogic containers is not affected by this setting, that is determined when you create your domain. | no default |
+| `weblogicDomainStoragePath` | Physical path of the storage for the PV.  When `weblogicDomainStorageType` is set to `HOST_PATH`, this value should be set the to path to the domain storage on the Kubernetes host.  When `weblogicDomainStorageType` is set to NFS, then `weblogicDomainStorageNFSServer` should be set to the IP address or name of the DNS server, and this value should be set to the exported path on that server.  Note that the path where the domain is mounted in the WebLogic containers is not affected by this setting; that is determined when you create your domain. | no default |
 | `weblogicDomainStorageReclaimPolicy` | Kubernetes PVC policy for the persistent storage. The valid values are: `Retain`, `Delete`, and `Recycle`. | `Retain` |
 | `weblogicDomainStorageSize` | Total storage allocated for the PVC. | `10Gi` |
 | `weblogicDomainStorageType` | Type of storage. Legal values are `NFS` and `HOST_PATH`. If using `NFS`, `weblogicDomainStorageNFSServer` must be specified. | `HOST_PATH` |
@@ -180,7 +180,7 @@ spec:
 
 #### Verify the PV and PVC objects
 
-You can use this command to verify the persistent volume was created, note that the `Status` field
+You can use this command to verify the persistent volume was created. Note that the `Status` field
 should have the value `Bound`, indicating the that persistent volume has been claimed:
 
 ```

docs-source/content/security/secrets.md

@@ -8,15 +8,24 @@ description: "Kubernetes secrets for the WebLogic operator"
 #### Contents
 * [WebLogic domain credentials secret](#weblogic-domain-credentials-secret)
 * [WebLogic domain image pull secret](#weblogic-domain-image-pull-secret)
+* [WebLogic operator configuration override secrets](#weblogic-operator-configuration-override-secrets)
 * [WebLogic operator external REST interface secret](#weblogic-operator-external-rest-interface-secret)
 * [WebLogic operator internal REST interface secret](#weblogic-operator-internal-rest-interface-secret)
 
 #### WebLogic domain credentials secret
 
-The credential for the WebLogic domain is kept in a Kubernetes `Secret` that
-follows the pattern `<domainUID>-weblogic-credentials`, where `<domainUID>` is
+The credentials for the WebLogic domain are kept in a Kubernetes `Secret` where the name of
+the secret is specified using `webLogicCredentialsSecret` in the WebLogic `Domain` resource.
+Also, the domain credentials secret must be created in the namespace where the `Domain` will be running.
+
+{{% notice note %}}
+For an example of a WebLogic domain resource using `webLogicCredentialsSecret`,
+see [Docker Image Protection]({{<relref "/security/domain-security/image-protection.md#1-use-imagepullsecrets-with-the-domain-resource">}}).
+{{% /notice %}}
+
+The samples supplied with the WebLogic operator use a naming convention that follows
+the pattern `<domainUID>-weblogic-credentials`, where `<domainUID>` is
 the unique identifier of the domain, for example, `domain1-weblogic-credentials`.
-The `Secret` is created in the namespace where the `Domain` will be running.
 
 If the WebLogic domain will be started in `domain1-ns` and the `<domainUID>` is `domain1`,
 an example of creating a Kubernetes `generic secret` is as follows:
@@ -67,7 +76,20 @@ Kubernetes `Secret` that holds the registry credentials.
 
 {{% notice info %}}
 For more information, see [Docker Image Protection]({{<relref "/security/domain-security/image-protection.md#weblogic-domain-in-docker-image-protection">}})
-under **Domain Security**.
+under **Domain security**.
+{{% /notice %}}
+
+#### WebLogic operator configuration override secrets
+
+The WebLogic operator supports embedding macros within configuration override templates
+that reference Kubernetes secrets. These Kubernetes secrets can be created with any name in the
+namespace where the `Domain` will be running. The Kubernetes secret names are
+specified using `configOverrideSecrets` in the WebLogic `Domain` resource.
+
+{{% notice info %}}
+For more information, see
+[Configuration overrides]({{<relref "/userguide/managing-domains/configoverrides/_index.md#how-do-you-specify-overrides">}})
+under **User Guide**.
 {{% /notice %}}
 
 #### WebLogic operator external REST interface secret
@@ -84,7 +106,7 @@ under **Securty**.
 #### WebLogic operator internal REST interface secret
 
 The operator exposes an internal REST HTTPS interface with a self-signed certificate.
-The certificate is kept in a Kubernetes `ConfigMap` with the name `weblogic-operator-cm ` using the key `internalOperatorCert`.
+The certificate is kept in a Kubernetes `ConfigMap` with the name `weblogic-operator-cm` using the key `internalOperatorCert`.
 The private key is kept in a Kubernetes `Secret` with the name `weblogic-operator-secrets` using the key `internalOperatorKey`.
 These Kubernetes objects are managed by the operator's Helm chart and are part of the
 namespace where the WebLogic operator is installed.

docs-source/content/userguide/introduction/_index.md

@@ -2,7 +2,7 @@
 title: "Introduction"
 date: 2019-02-23T16:43:10-05:00
 weight: 2
-description: "Learn about the operator's design, architecture, terms, and prerequisites."
+description: "Learn about the operator's design, architecture, important terms, and prerequisites."
 ---
 {{% children style="h4" description="true" %}}
 

docs-source/content/userguide/introduction/demo.md

@@ -3,7 +3,7 @@ title: "Demo"
 date: 2019-02-23T20:51:59-05:00
 draft: false
 weight: 2
-description: "This video provides a demonstration of the WebLogic Server Kubernetes Operator."
+description: "Watch a video demonstration of the WebLogic Server Kubernetes Operator."
 ---
 
 This video provides a demonstration of the WebLogic Server Kubernetes Operator.

docs-source/content/userguide/introduction/design.md

@@ -6,7 +6,7 @@ weight: 4
 description: "The Oracle WebLogic Server Kubernetes Operator (the “operator”) is designed to fulfill a similar role to that which a human operator would fill in a traditional data center deployment.  It contains a set of useful built-in knowledge about how to perform various life cycle operations on a domain correctly."
 ---
 
-The Oracle WebLogic Server Kubernetes Operator (the “operator”) is designed to fulfill a similar role to that which a human operator would fill in a traditional data center deployment.  It contains a set of useful built-in knowledge about how to perform various life cycle operations on a domain correctly.a traditional data center deployment.  It contains a set of useful built-in knowledge about how to perform various life cycle operations on a domain correctly.
+The Oracle WebLogic Server Kubernetes Operator (the “operator”) is designed to fulfill a similar role to that which a human operator would fill in a traditional data center deployment.  It contains a set of useful built-in knowledge about how to perform various life cycle operations on a domain correctly.
 
 Human operators are normally responsible for starting and stopping environments, initiating backups, performing scaling operations, performing manual tasks associated with disaster recovery and high availability needs and coordinating actions with other operators in other data centers.  It is envisaged that the operator will have similar responsibilities in a Kubernetes environment.