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

Author: vanajamukkara

README.md

@@ -4,9 +4,7 @@ Built with [Wercker](http://www.wercker.com)
 
 [![wercker status](https://app.wercker.com/status/68ce42623fce7fb2e52d304de8ea7530/m/develop "wercker status")](https://app.wercker.com/project/byKey/68ce42623fce7fb2e52d304de8ea7530)
 
-Oracle is finding ways for organizations using WebLogic Server to run important workloads, to move those workloads into the cloud. By certifying on industry standards, such as Docker and Kubernetes, WebLogic now runs in a cloud neutral infrastructure. To enhance WebLogic taking full advantage of Kubernetes, you can persist the WebLogic domain home in a Docker image, making deployment much more portable and improving support for CI/CD deployments.
-
-In addition, we've provided an open-source Oracle WebLogic Server Kubernetes Operator (the “operator”) which has several key features to assist you with deploying and managing WebLogic domains in a Kubernetes environment. You can:
+Oracle is finding ways for organizations using WebLogic Server to run important workloads, to move those workloads into the cloud. By certifying on industry standards, such as Docker and Kubernetes, WebLogic now runs in a cloud neutral infrastructure. In addition, we've provided an open-source Oracle WebLogic Server Kubernetes Operator (the “operator”) which has several key features to assist you with deploying and managing WebLogic domains in a Kubernetes environment. You can:
 
 *	Create WebLogic domains on a Kubernetes persistent volume. This persistent volume can reside in an NFS.
 * Create a WebLogic domain in a Docker image.
@@ -66,7 +64,7 @@ Use these [scripts and Helm charts](kubernetes/samples/README.md) to install Tra
 
 ### Configuring Kibana and Elasticsearch
 
-You can send the operator logs to Elasticsearch, to be displayed in Kibana. Use this [sample script](samples/scripts/elasticsearch_and_kibana.yaml) to configure Elasticsearch and Kibana deployments and services.
+You can send the operator logs to Elasticsearch, to be displayed in Kibana. Use this [sample script](kubernetes/samples/scripts/elasticsearch_and_kibana.yaml) to configure Elasticsearch and Kibana deployments and services.
 
 ## Create and manage the operator
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java

@@ -209,30 +209,7 @@ private void callHelmInstall() throws Exception {
   }
 
   private void reportHelmInstallFailure(String cmd, ExecResult result) throws Exception {
-    String cause = getExecFailure(cmd, result);
-    if (result.stderr().contains("Error: Job failed: BackoffLimitExceeded")) {
-      // The operator helm chart pre-install hook probably failed.
-      // This is probably because there is a problem with the values passed in,
-      // for example a listed domain namespace does not exist.
-      // Fetch the pre-install hook's results and return it too.
-      String hookResults = getOperatorHelmChartHookResults("pre-install");
-      cause = cause + "\n pre-install-hook returned\n" + hookResults;
-    }
-    throw new RuntimeException(cause);
-  }
-
-  private String getOperatorHelmChartHookResults(String hookType) throws Exception {
-    String cmd =
-        "kubectl logs job/"
-            + operatorMap.get("releaseName")
-            + "-weblogic-operator-"
-            + hookType
-            + "-hook -n kube-system";
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      return getExecFailure(cmd, result);
-    }
-    return result.stdout();
+    throw new RuntimeException(getExecFailure(cmd, result));
   }
 
   private String getExecFailure(String cmd, ExecResult result) throws Exception {

kubernetes/charts/weblogic-operator/templates/_operator-verification-hook.tpl

@@ -33,10 +33,6 @@
 {{-     $ignore := include "utils.verifyInteger" (list $scope "elasticSearchPort") -}}
 {{-   end -}}
 {{- end -}}
-{{- $ignore := include "utils.verifyString" (list $scope "tillerNamespace") -}}
-{{- $ignore := include "utils.verifyString" (list $scope "tillerServiceAccount") -}}
 {{- $ignore := include "utils.verifyOptionalBoolean" (list $scope "mockWLS") -}}
 {{- $ignore:= include "utils.endValidation" $scope -}}
-{{- include "operator.operatorVerificationHook" (list $scope "pre-upgrade") }}
-{{- include "operator.operatorVerificationHook" (list $scope "pre-install") }}
 {{- end -}}

kubernetes/charts/weblogic-operator/templates/_validate-inputs.tpl

@@ -96,9 +96,3 @@ elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 
 # elasticSearchPort specifies the port number of where elasticsearch is running
 elasticSearchPort: 9200
-
-# tillerNamespace is the name of the namespace that tiller is configured to use.
-tillerNamespace: "kube-system"
-
-# tillerServiceAccount is the name of the service account that tiller is configured to use.
-tillerServiceAccount: "default"

kubernetes/charts/weblogic-operator/values.yaml

@@ -13,4 +13,4 @@
 * [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 Apache  Helm chart](charts/apache-webtier/README.md) for setting up a load balancer for WebLogic clusters using the Apache HTTP Server with WebLogic Server Plugins.
+* [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/README.md

@@ -0,0 +1,8 @@
+# Apache load balancer samples
+
+The sample package contains two samples that use the [Apache helm chart](../apache-webtier/README.md). The samples use the Docker image for the Apache HTTP Server with the 12.2.1.3.0 Oracle WebLogic Server Proxy Plugin.  See the details in [Apache HTTP Server with Oracle WebLogic Server Proxy Plugin on Docker](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache).
+
+* [The default sample](default-sample/README.md) uses the built-in configuration in the above Docker image.
+
+* [The custom sample](custom-sample/README.md) demonstrates how to customize the configuration of the Apache HTTP Server with the 12.2.1.3.0 Oracle WebLogic Server Proxy Plugins.
+

kubernetes/samples/charts/apache-samples/README.md

@@ -1,16 +1,8 @@
-# Apache webtier
-The Apache HTTP Server load balancer for WebLogic domains on Kubernetes
-
-## Install
-
-```console
-$ helm install apache-webtier
-```
-
-## Introduction
-
-This chart bootstraps an Apache HTTP Server deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+# Apache webtier Helm chart
 
+This Helm chart bootstraps an Apache HTTP Server deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+ 
+The chart depends on the Docker image for the Apache HTTP Server with the 12.2.1.3.0 Oracle WebLogic Server Proxy Plugin.  See the details in [Apache HTTP Server with Oracle WebLogic Server Proxy Plugin on Docker](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache).
 
 ## Prerequisites
 
@@ -26,7 +18,7 @@ To install the chart with the release name `my-release`:
 ```console
 $ helm install --name my-release apache-webtier
 ```
-The command deploys the Apache HTTP Server on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys the Apache HTTP Server on the Kubernetes cluster with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 > **Tip**: List all releases using `helm list`
 

kubernetes/samples/charts/apache-webtier/README.md

@@ -8,6 +8,18 @@
 #  The following pre-requisites must be handled prior to running this script:
 #    * The kubernetes namespace must already be created
 #
+# Secret name determination
+#  1) secretName - if specified
+#  2) domain1-weblogic-credentials - if secretName and domainUID are both not specified. This is the default out-of-the-box.
+#  3) <domainUID>-weblogic-credentials - if secretName is not specified, and domainUID is specified.
+#  4) weblogic-credentials - if secretName is not specified, and domainUID is specified as "".
+#
+# The generated secret will be labeled with 
+#       weblogic.domainUID=$domainUID 
+# and
+#       weblogic.domainName=$domainUID 
+# Where the $domainUID is the value of the -d command line option, unless the value supplied is an empty String ""
+#
 
 script="${BASH_SOURCE[0]}"
 
@@ -27,11 +39,12 @@ function validateKubectlAvailable {
 }
 
 function usage {
-  echo usage: ${script} -u username -p password [-d domainUID] [-n namespace] [-h]
+  echo usage: ${script} -u username -p password [-d domainUID] [-n namespace] [-s sercretName] [-h]
   echo "  -u username, must be specified."
   echo "  -p password, must be specified."
-  echo "  -n namespace, optional."
-  echo "  -d domainUID, optional."
+  echo "  -n namespace, optional. The value is default if not specified"
+  echo "  -d domainUID, optional. The default value is `domain1`. When specified, the secret will be label with the domainUID unless the given value is an empty string."
+  echo "  -s secretName, optional. When not specified, the secret name will be determined based on the domainUID option"
   echo "  -h Help"
   exit $1
 }
@@ -41,7 +54,7 @@ function usage {
 #
 domainUID=domain1
 namespace=default
-while getopts "hu:p:n:d:" opt; do
+while getopts "hu:p:n:d:s:" opt; do
   case $opt in
     u) username="${OPTARG}"
     ;;
@@ -51,13 +64,22 @@ while getopts "hu:p:n:d:" opt; do
     ;;
     d) domainUID="${OPTARG}"
     ;;
+    s) secretName="${OPTARG}"
+    ;;
     h) usage 0
     ;;
     *) usage 1
     ;;
   esac
 done
-secretName=$domainUID-weblogic-credentials
+
+if [ -z $secretName ]; then
+  if [ -z $domainUID ]; then
+    secretName=weblogic-credentials
+  else 
+    secretName=$domainUID-weblogic-credentials
+  fi
+fi
 
 if [ -z ${username} ]; then
   echo "${script}: -u must be specified."
@@ -84,13 +106,15 @@ kubectl -n $namespace create secret generic $secretName \
   --from-literal=username=$username \
   --from-literal=password=$password
 
-# label the secret with domainUID
-kubectl label secret ${secretName} -n $namespace weblogic.domainUID=$domainUID weblogic.domainName=$domainUID
+# label the secret with domainUID if needed
+if [ ! -z $domainUID ]; then
+  kubectl label secret ${secretName} -n $namespace weblogic.domainUID=$domainUID weblogic.domainName=$domainUID
+fi
 
 # Verify the secret exists
 SECRET=`kubectl get secret ${secretName} -n ${namespace} | grep ${secretName} | wc | awk ' { print $1; }'`
 if [ "${SECRET}" != "1" ]; then
   fail "The secret ${secretName} was not found in namespace ${namespace}"
 fi
 
-echo "The secret ${secretName} has been successfully created in namespace ${namespace}"
+echo "The secret ${secretName} has been successfully created in the ${namespace} namespace."