resolve merge conflicts

Author: markxnelson

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

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/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/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

@@ -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,18 +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
-
-# 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

@@ -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'