Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into feature-version

Author: moreaut

README.md

@@ -161,7 +161,7 @@ Please refer to [Shutting down a domain](site/shutdown-domain.md) for informatio
 
 ## Load balancing with an Ingress controller or a web server
 
-You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to Load balancing with Voyager Ingress Controller, [Load balancing with Traefik Ingress Controller](site/traefik.md), and [Load balancing with Apache Web Server](site/apache.md) for information about the current capabilities and setup instructions for each of the supported load balancers.
+You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to Load balancing with Voyager Ingress Controller, [Load balancing with Traefik Ingress Controller](site/traefik.md), and [Load balancing with Apache HTTP Server](site/apache.md) for information about the current capabilities and setup instructions for each of the supported load balancers.
 
 
 [comment]: # (Exporting operator logs to ELK.  The operator provides an option to export its log files to the ELK stack. Please refer to [ELK integration]site/elk.md for information about this capability.)

site/k8s_setup.md

@@ -11,18 +11,18 @@ If you need some help setting up a Kubernetes environment to experiment with the
 
 * Set up your own Kubernetes environment on bare compute resources on a cloud.
 * Use you cloud provider's management console to provision a managed Kubernetes environment.
-* Install Kubernetes on your own compute resources (i.e. "real" computers, outside a cloud).
+* Install Kubernetes on your own compute resources (for example, "real" computers, outside a cloud).
 
 "Development/test" options:
 
 * Install [Docker for Mac](https://docs.docker.com/docker-for-mac/#kubernetes) and enable its embedded Kubernetes cluster (or register for the [Docker for Windows](https://beta.docker.com/form) beta and wait until Kubernetes is available there).
 * Install [Minikube](https://github.com/kubernetes/minikube) on your Windows/Linux/Mac computer.
 
-We have provided our hints and tips for several of these options in the sections below:
+We have provided our hints and tips for several of these options in the sections below.
 
 ## Set up Kubernetes on bare compute resources in a cloud
 
-Follow the basic steps from the  [Terraform Kubernetes installer for Oracle Cloud Infrastructure](https://github.com/oracle/terraform-kubernetes-installer):
+Follow the basic steps from the  [Terraform Kubernetes installer for Oracle Cloud Infrastructure](https://github.com/oracle/terraform-kubernetes-installer).
 
 ### Prerequisites
 
@@ -34,7 +34,7 @@ providers {
   oci = "<path_to_provider_binary>/terraform-provider-oci"
 }
 ```
-4.  Ensure you have [Kubectl][Kubectl] installed if you plan to interact with the cluster locally.
+4.  Ensure that you have [Kubectl][Kubectl] installed if you plan to interact with the cluster locally.
 
 ### Quick Start
 
@@ -50,13 +50,13 @@ cd terraform-kubernetes-installer
 terraform init
 ```
 
-3.  Copy the example terraform.tvfars:
+3.  Copy the example `terraform.tvfars`:
 
 ```
 cp terraform.example.tfvars terraform.tfvars
 ```
 
-4.  Edit the `terraform.tvfars` file to include values for your tenancy, user, and compartment.  Optionally edit variables to change the `Shape` of the VMs for your Kubernetes master and workers, and your etcd cluster.   For example:
+4.  Edit the `terraform.tvfars` file to include values for your tenancy, user, and compartment.  Optionally, edit variables to change the `Shape` of the VMs for your Kubernetes master and workers, and your `etcd` cluster.   For example:
 
 ```
 #give a label to your cluster to help identify it if you have multiple
@@ -138,20 +138,20 @@ $
 ```
 
 
-## Install Kubernetes on your own compute resources (e.g. Oracle Linux servers outside a cloud)
+## Install Kubernetes on your own compute resources (for example, Oracle Linux servers outside a cloud)
 
-These instructions are for Oracle Linux 7u2+.  If you are using a different flavor of Linux, you will need to adjust accordingly.
+These instructions are for Oracle Linux 7u2+.  If you are using a different flavor of Linux, you will need to adjust them accordingly.
 
-**NOTE** These steps must be run with the `root` user, until specified otherwise!  Any time you see `YOUR_USERID` in a command, you should replace it with your actual userid.
+**NOTE**: These steps must be run with the `root` user, until specified otherwise!  Any time you see `YOUR_USERID` in a command, you should replace it with your actual `userid`.
 
-Choose the directories where your Docker and Kubernetes files will be stored.  The Docker directory should be on a disk with a lot of free space (more than 100GB) because it will be used for the `/var/lib/docker` file syste, which contains all of your images and containers. The Kubernetes directory will be used for the `/var/lib/kubelet` file system and persistent volume storage.
+Choose the directories where your Docker and Kubernetes files will be stored.  The Docker directory should be on a disk with a lot of free space (more than 100GB) because it will be used for the `/var/lib/docker` file system, which contains all of your images and containers. The Kubernetes directory will be used for the `/var/lib/kubelet` file system and persistent volume storage.
 
 ```
 export docker_dir=/scratch/docker
 export k8s_dir=/scratch/k8s_dir
 ```
 
-Create a shell script that sets up the necessary environment variables. You should probably just append this to the user's `.bashrc` so that it will get executed at login.  You will also need to configure your proxy settings in here if you are behind an HTTP proxy:
+Create a shell script that sets up the necessary environment variables. You should probably just append this to the user's `.bashrc` so that it will get executed at login.  You will also need to configure your proxy settings here if you are behind an HTTP proxy:
 
 ```
 export PATH=$PATH:/sbin:/usr/sbin
@@ -186,14 +186,14 @@ If you want command completion, you can add the following to the script:
 source <(kubectl completion bash)
 ```
 
-Create the directories we need:
+Create the directories you need:
 
 ```
 mkdir -p $docker_dir $k8s_dir/kubelet
 ln -s $k8s_dir/kubelet /var/lib/kubelet
 ```
 
-Set an environment variable with the Docker version we want to install:
+Set an environment variable with the Docker version you want to install:
 
 ```
 docker_version="17.03.1.ce"
@@ -219,7 +219,7 @@ diff /etc/sysconfig/docker /tmp/docker.out
 mv /tmp/docker.out /etc/sysconfig/docker
 ```
 
-Set up the Docker network, including the HTTP proxy configuration if you need it:
+Set up the Docker network, including the HTTP proxy configuration, if you need it:
 
 ```
 # generate a custom /setc/sysconfig/docker-network
@@ -238,7 +238,7 @@ Add your user to the `docker` group:
 usermod -aG docker YOUR_USERID
 ```
 
-Enable and start the Docker service that we just installed and configured:
+Enable and start the Docker service that you just installed and configured:
 
 ```
 systemctl enable docker && systemctl start docker
@@ -314,7 +314,7 @@ chown YOUR_USERID:YOUR_GROUP $KUBECONFIG
 chmod 644 $KUBECONFIG
 ```
 
-**NOTE** The following steps should be run with your normal (non-`root`) user.
+**NOTE**: The following steps should be run with your normal (non-`root`) user.
 
 Configure CNI:
 
@@ -357,7 +357,7 @@ Congratulations!  Docker and Kubernetes are installed and configured!
 
 ## Install Docker for Mac with Kubernetes
 
-Docker for Mac 17.12 CE Edge provides an [embedded Kubernetes environment](https://docs.docker.com/docker-for-mac/#kubernetes) that is a pretty quick and easy way to get a simple test environment set up on your Mac.  To set it up, follow these instructions:
+Docker for Mac 17.12 CE Edge provides an [embedded Kubernetes environment](https://docs.docker.com/docker-for-mac/#kubernetes) that is a quick and easy way to get a simple test environment set up on your Mac.  To set it up, follow these instructions:
 
 Install "Docker for Mac" from the Edge channel [https://download.docker.com/mac/edge/Docker.dmg](https://download.docker.com/mac/edge/Docker.dmg).  Then start up the Docker application (press Command-Space bar, type in `Docker` and run it).  After it is running you will see the Docker icon appear in your status bar:
 
@@ -371,7 +371,7 @@ Go to the "Kubernetes" tab and click on the option to enable Kubernetes:
 
 ![Enable Kubernetes setting](images/docker-enable-k8s.png)
 
-**Note** If you are behind an HTTP proxy, then you should also go to the "Proxies" tab and enter your proxy details.
+**Note**: If you are behind an HTTP proxy, then you should also go to the "Proxies" tab and enter your proxy details.
 
 Docker will download the Kuberentes components and start them up for you.  When it is done, you will see the Kubernetes status go to green/running in the menu:
 

site/manually-creating-domain.md

@@ -1,8 +1,8 @@
 # Manually creating a WebLogic domain
 
-**PLEASE NOTE** This page is a work in progress, we have some rough notes in here, we are working on writing better doc for how to set up this integration.
+**PLEASE NOTE**: This page is a work in progress. We have some rough notes here and are working on writing better documentation for how to set up this procedure.
 
-If creating the domain manually, using a WLST script for example, the domain must be configured to meet these requirements:
+If you are creating the domain manually, for example, using a WLST script, the domain must be configured to meet these requirements:
 
 *	Domain directory should be in `/shared/domain`.
 *	Applications directory should be in `/shared/applications`.
@@ -11,11 +11,11 @@ If creating the domain manually, using a WLST script for example, the domain mus
 
 ## Use the scripts to create the sample YAML files
 
-The `create-weblogic-domain.sh` script described in the previous section can be executed with the “-g” option, which will cause it to generate the YAML files but take no action at all against the Kubernetes environment.  This is a useful way to create the sample YAML files needed to manually create a domain.
+The `create-weblogic-domain.sh` script can be executed with the `-g` option, which will cause it to generate the YAML files but take no action at all against the Kubernetes environment.  This is a useful way to create the sample YAML files needed to manually create a domain.
 
 First, make a copy of `create-weblogic-domain-inputs.yaml` and customize it.
 
-Next, choose and create a directory that generated operator related files will be stored in, e.g. /path/to/weblogic-operator-output-directory
+Next, choose and create a directory that generated operator-related files will be stored in, for example, `/path/to/weblogic-operator-output-directory`.
 
 Then, execute the script, pointing it at your inputs file and output directory:
 
@@ -25,7 +25,7 @@ Then, execute the script, pointing it at your inputs file and output directory:
   -o /path/to/weblogic-operator-output-directory
 ```
 
-The following YAML files will be generated in the /path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID> directory:
+The following YAML files will be generated in the `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>` directory:
 
 *	`weblogic-domain-pv.yaml` can be customized and used to create the persistent volume for this domain.
 *	`weblogic-domain-pvc.yaml` can be customized and used to create the persistent volume claim for this domain.
@@ -48,13 +48,13 @@ The file `weblogic-domain-pv.yaml` contains a template to create a persistent vo
 *	Persistent volume name
 *	Storage class name
 *	The amount of storage to allocate
-*	The physical location of the persistent volume (edit). Prior to creating the persistent volume you need to ensure this location exists and has read/write/execute permission set for the account that Kubernetes is running from.
+*	The physical location of the persistent volume (edit). Prior to creating the persistent volume, you need to ensure this location exists and has read/write/execute permissions set for the account that Kubernetes is running from.
 *	The access mode is Read/Write Many. You must use a provider that supports Read/Write Many.
 *	The contents of the volume are retained across restarts of the Kubernetes environment.
 
 ## Creating the persistent volume
 
-To create the persistent volume issue the following command:
+To create the persistent volume, issue the following command:
 
 ```
 kubectl create –f weblogic-domain-pv.yaml
@@ -70,7 +70,7 @@ Replace `PV_NAME` with the name of the persistent volume.
 
 ## Preparing to create the persistent volume claim
 
-The file `weblogic-domain-pvc.yaml` contains a template to claim a portion of the persistent volume storage. The customizable items are listed below:
+The file, `weblogic-domain-pvc.yaml`, contains a template to claim a portion of the persistent volume storage. The customizable items are:
 
 *	Persistent volume claim name
 *	Namespace name
@@ -80,7 +80,7 @@ The file `weblogic-domain-pvc.yaml` contains a template to claim a portion of th
 
 ## Creating the persistent volume claim
 
-To create the persistent volume claim issue the following command:
+To create the persistent volume claim, issue the following command:
 
 ```
 kubectl create –f weblogic-domain-pvc.yaml
@@ -96,7 +96,7 @@ Replace `PVC_NAME` with the name of the persistent volume claim.
 
 ## Preparing to create the domain custom resource
 
-The file `domain-custom-resource.yaml` contains a template to create the domain custom resource.  The customizable items are listed below:
+The file, `domain-custom-resource.yaml`, contains a template to create the domain custom resource.  The customizable items are:
 
 *	Domain name
 *	Namespace name