Merge remote-tracking branch 'origin/develop' into schema-fix3

Author: rjeberhard

README.md

@@ -45,7 +45,7 @@ Before using the operator, you might want to read the [design philosophy](site/d
 
 *	Kubernetes 1.10.11+, 1.11.5+, and 1.12.3+  (check with `kubectl version`).
 *	Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`)
-*	Docker 17.03.1.ce (check with `docker version`)
+*	Docker 18.03.1.ce (check with `docker version`)
 *	Oracle WebLogic Server 12.2.1.3.0
 
 ## Set up your Kubernetes cluster

kubernetes/charts/weblogic-operator/Chart.yaml

@@ -3,4 +3,4 @@
 
 name: weblogic-operator
 version: 2.0
-description: Helm package for creation of the Weblogic operator.
+description: Helm chart for configuring the WebLogic operator.

kubernetes/charts/weblogic-operator/values.yaml

@@ -1,36 +1,39 @@
 # Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-# serviceAccount specifies the name of the service account that the operator will use to
-# make requests to the Kubernetes API server.
-# The name must be lowercase.
+# serviceAccount specifies the name of the service account in the operator's namespace that the
+# operator will use to make requests to the Kubernetes API server.
+# The customer is responsible for creating the service account.
+# If not specified, the the operator will use the operator's namespace's 'default' service account.
 serviceAccount: "default"
 
-# domainNamespaces specifies list of WebLogic Domain namespaces which the operator manages
-# The names must be lowercase.
+# domainNamespaces specifies list of WebLogic Domain namespaces which the operator manages.
 # The customer is responsible for creating these namespaces.
+# If not specified, then the operator will manage WebLogic domains in the Kubernetes 'default' namespace.
 #
 # Example : In the configuration below, the helm installation will manage namespace1 and namespace2.
 #
 # domainNamespaces:
-#   - namespace1
-#   - namespace2
-domainNamespaces: [ "default" ]
+#   - "namespace1"
+#   - "namespace2"
+domainNamespaces:
+  - "default"
 
 # image specifies the docker image containing the operator code.
-image: "weblogic-kubernetes-operator:1.1"
+image: "weblogic-kubernetes-operator:2.0"
 
 # imagePullPolicy specifies the image pull policy for the operator docker image.
 imagePullPolicy: "IfNotPresent"
 
 # imagePullSecrets contains an optional list of Kubernetes secrets, in the operator's namepace,
 # that are needed to access the registry containing the operator Docker image.
+# The customer is responsible for creating the secret.
 # If no secrets are required, then omit this property.
 #
 # Example : a secret is needed, and has been stored in 'my-operator-secret'
 #
 # imagePullSecrets:
-# - name: my-operator-secret
+# - name: "my-operator-secret"
 #
 # imagePullSecrets:
 # - name:
@@ -39,7 +42,7 @@ imagePullPolicy: "IfNotPresent"
 # outside of the Kubernetes cluster on the port specified by the 'externalRestHttpsPort'
 # property.
 #
-# If set to true, then the customer provide the SSL certificate and private key for
+# If set to true, then the customer must provide the SSL certificate and private key for
 # the operator's external REST intervace by specifying the 'externalOperatorCert' and
 # 'externalOperatorKey' properties.
 externalRestEnabled: false
@@ -49,20 +52,20 @@ externalRestEnabled: false
 # Otherwise, it is ignored.
 externalRestHttpsPort: 31001
 
-# The customer supplied certificate to use for the external operator REST
-# https interface.  The value must be a string containing a base64 encoded PEM certificate.
+# The customer supplied certificate to use for the external operator REST https interface.
+# The value must be a string containing a base64 encoded PEM certificate.
 # This parameter is required if 'externalRestEnabled' is true.
 # Otherwise, it is ignored.
 #externalOperatorCert:
 
-# The customer supplied private key to use for the external operator REST
-# https interface.  The value must be a string containing a base64 encoded PEM key.
+# The customer supplied private key to use for the external operator REST https interface.
+# The value must be a string containing a base64 encoded PEM key.
 # This parameter is required if 'externalRestEnabled' is true.
 # Otherwise, it is ignored.
 #externalOperatorKey:
 
-# remoteDebugNodePortEnabled specifies whether or not the operator will start a Java remote debug server on the
-# provided port and suspend execution until a remote debugger has attached.
+# remoteDebugNodePortEnabled specifies whether or not the operator will start a Java remote debug server
+# on the provided port and suspend execution until a remote debugger has attached.
 # The 'internalDebugHttpPort' property controls the port number inside the Kubernetes
 # cluster and the 'externalDebugHttpPort' property controls the port number outside
 # the Kubernetes cluster.
@@ -87,12 +90,14 @@ javaLoggingLevel: "INFO"
 # elkIntegrationEnabled specifies whether or not ELK integration is enabled.
 elkIntegrationEnabled: false
 
-# logStashImage specifies the docker image containing logstash
-# TBD - should the logstash image pull policy and image pull secrets be configurable?
+# logStashImage specifies the docker image containing logstash.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 logStashImage: "logstash:5"
 
-# elasticSearchHost specifies the hostname of where elasticsearch is running
+# elasticSearchHost specifies the hostname of where elasticsearch is running.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 
-# elasticSearchPort specifies the port number of where elasticsearch is running
+# elasticSearchPort specifies the port number of where elasticsearch is running.
+# This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchPort: 9200

kubernetes/samples/README.md

@@ -1,16 +1,16 @@
-# WebLogic Operator Samples
+# WebLogic operator samples
 
 ## Sample scripts
 
-* [Sample secret for WebLogic admin credentials](scripts/create-weblogic-domain/create-weblogic-credentials.sh) for creating a Kubernetes secret that contains the Administration Server credentials. This secret can be used in creating a WebLogic domain custom resource.
-* [Sample PV and PVC](scripts/create-weblogic-domain-pv-pvc/README.md) for creating a PV or PVC that can be used by a domain custom resource as the persistent storage for the WebLogic domain home or log files.
-* [Sample domain home on a persistent volume](scripts/create-weblogic-domain/domain-home-on-pv/README.md) for creating a WebLogic domain home on an existing PV or PVC, and the domain customer resource YAML file for deploying the generated WebLogic domain.
-* [Sample Elasticsearch and Kibana configuration](scripts/elasticsearch_and_kibana.yaml) for configuring the Elasticsearch and Kibana deployments and services for the operator's logs.
-* [Sample self-signed certificate and private key](scripts/generate-external-rest-identity.sh) for generating a self-signed certificate and private key that can be used for the operator's external REST API.
+* [Sample for creating a Kubernetes secret](scripts/create-weblogic-domain/create-weblogic-credentials.sh) that contains the Administration Server credentials. This secret can be used in creating a WebLogic domain resource.
+* [Sample for creating a PV or PVC](scripts/create-weblogic-domain-pv-pvc/README.md) that can be used by a domain resource as the persistent storage for the WebLogic domain home or log files.
+* [Sample for creating a WebLogic domain home on an existing PV or PVC](scripts/create-weblogic-domain/domain-home-on-pv/README.md), and the domain resource YAML file for deploying the generated WebLogic domain.
+* [Sample for configuring the Elasticsearch and Kibana](scripts/elasticsearch_and_kibana.yaml) deployments and services for the operator's logs.
+* [Sample for generating a self-signed certificate and private key](scripts/generate-external-rest-identity.sh) that can be used for the operator's external REST API.
 
 ## Sample Helm charts
 
 * [Sample Traefik Helm chart](charts/traefik/README.md) for setting up a Traefik load balancer for WebLogic clusters.
 * [Sample Voyager Helm chart](charts/voyager/README.md) for setting up a Voyager load balancer for WebLogic clusters.
-* [Sample Ingress Helm chart](charts/ingress-per-domain/README.md) for setting up a Kubernetes Ingress for each WebLogic cluster using Traefik or Voyager load balancer.
+* [Sample Ingress Helm chart](charts/ingress-per-domain/README.md) for setting up a Kubernetes Ingress for each WebLogic cluster using a Traefik or Voyager load balancer.
 * [Sample Apache  Helm chart](charts/apache-webtier/README.md) and [Apache samples using the default or custom configurations](charts/apache-samples/README.md) for setting up a load balancer for WebLogic clusters using the Apache HTTP Server with WebLogic Server Plugins.

kubernetes/samples/charts/README.md

@@ -2,12 +2,12 @@
 
 ## Load balancer sample scripts
 
-The Oracle WebLogic Server Kubernetes Operator supports three load balancers: TRAEFIK, VOYAGER, and APACHE. We provide samples that demonstrate how to install and configure each one. The samples are located in following folders:
+The Oracle WebLogic Server Kubernetes Operator supports three load balancers: Traefik, Voyager, and Apache. We provide samples that demonstrate how to install and configure each one. The samples are located in following folders:
 
 * [traefik](traefik/README.md)
 * [voyager](voyager/README.md)
-* apache-samples [custom-sample](apache-samples/custom-sample/README.md)
-* apache-samples [default-sample](apache-samples/default-sample/README.md)
+* apache-samples/[custom-sample](apache-samples/custom-sample/README.md)
+* apache-samples/[default-sample](apache-samples/default-sample/README.md)
 * [ingress-per-domain](ingress-per-domain/README.md)
 * [apache-webtier](apache-webtier/README.md)
 

kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/README.md

@@ -1,6 +1,6 @@
-# Sample Persistent Volume and Persistent Volume Claim
+# Sample persistent volume and persistent volume claim
 
-The sample scripts demonstrate the creation of a Kubernetes persistent volume (PV) and persistent volume claim (PVC), which can then be used in a domain custom resource as a persistent storage for the WebLogic domain home or log files.
+The sample scripts demonstrate the creation of a Kubernetes persistent volume (PV) and persistent volume claim (PVC), which can then be used in a domain resource as a persistent storage for the WebLogic domain home or log files.
 
 A PV and PVC can be shared by multiple WebLogic domains or dedicated to a particular domain.
 

kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/create-pv-pvc-inputs.yaml

@@ -26,7 +26,7 @@ weblogicDomainStorageType: HOST_PATH
 
 # Physical path of the persistent storage.
 # The following line must be uncomment and customized:
-weblogicDomainStoragePath: /scratch/k8s_dir
+#weblogicDomainStoragePath: /scratch/k8s_dir
 
 # Reclaim policy of the persistent storage
 # The valid values are: 'Retain', 'Delete', and 'Recycle'