Merge remote-tracking branch 'origin/develop' into domain-sample-cleanup

Author: doxiao

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

@@ -301,11 +301,6 @@ function createFiles {
   echo Generating ${domainPropertiesOutput}
 
   cp ${domainPropertiesInput} ${domainPropertiesOutput}
-  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%MANAGED_SERVER_PORT%:${managedServerPort}:g" ${domainPropertiesOutput}
-  sed -i -e "s:%MANAGED_SERVER_NAME_BASE%:${managedServerNameBase}:g" ${domainPropertiesOutput}
   sed -i -e "s:%CONFIGURED_MANAGED_SERVER_COUNT%:${configuredManagedServerCount}:g" ${domainPropertiesOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${domainPropertiesOutput}
   sed -i -e "s:%PRODUCTION_MODE_ENABLED%:${productionModeEnabled}:g" ${domainPropertiesOutput}

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain.sh

@@ -11,15 +11,7 @@ metadata:
   labels:
     weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
-    weblogic.domainName: %DOMAIN_NAME%
 spec:
-  # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
-  # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
-  # to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
-  # The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
-  domainUID: %DOMAIN_UID%
-  # The WebLogic Domain Name
-  domainName: %DOMAIN_NAME%
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
   # If the domain home is in the image
@@ -32,10 +24,6 @@ spec:
   # how to create that Secret at the end of this file)
   adminSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
-  # The name of the Admin Server
-  asName: "%ADMIN_SERVER_NAME%"
-  # The Admin Server's ListenPort
-  asPort: %ADMIN_PORT%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
   # serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
@@ -52,9 +40,9 @@ spec:
     value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
-  # serverStartState legal values are "RUNNING" or "ADMIN"
-  # "RUNNING" means the listed server will be started up to "RUNNING" mode
-  # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    # serverStartState legal values are "RUNNING" or "ADMIN"
+    # "RUNNING" means the listed server will be started up to "RUNNING" mode
+    # "ADMIN" means the listed server will be start up to "ADMIN" mode
     serverStartState: "RUNNING"
     # The Admin Server's NodePort
     %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/domain-template.yaml

@@ -390,13 +390,10 @@ function createYamlFiles {
   sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${dcrOutput}
-  sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${dcrOutput}
   sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${dcrOutput}
-  sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${dcrOutput}
   sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
-  sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${dcrOutput}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain.sh

@@ -12,15 +12,7 @@ metadata:
   labels:
     weblogic.resourceVersion: domain-v2
     weblogic.domainUID: %DOMAIN_UID%
-    weblogic.domainName: %DOMAIN_NAME%
 spec:
-  # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must
-  # have its own unique domainUID.  This does not have to be the same as the Domain Name.  It is allowed
-  # to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
-  # The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
-  domainUID: %DOMAIN_UID%
-  # The WebLogic Domain Name
-  domainName: %DOMAIN_NAME%
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
   # If the domain home is in the image
@@ -36,10 +28,6 @@ spec:
   # how to create that Secret at the end of this file)
   adminSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
-  # The name of the Admin Server
-  asName: "%ADMIN_SERVER_NAME%"
-  # The Admin Server's ListenPort
-  asPort: %ADMIN_PORT%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
   # The in-pod name of the directory to store the domain, node manager, server logs, and server .out
@@ -61,9 +49,10 @@ spec:
     value: "-Xms64m -Xmx256m "
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
-  # serverStartState legal values are "RUNNING" or "ADMIN"
-  # "RUNNING" means the listed server will be started up to "RUNNING" mode
-  # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    # serverStartState legal values are "RUNNING" or "ADMIN"
+    # "RUNNING" means the listed server will be started up to "RUNNING" mode
+    # "ADMIN" means the listed server will be start up to "ADMIN" mode
+    serverStartState: "RUNNING"
     # The Admin Server's NodePort
     %EXPOSE_ADMIN_PORT_PREFIX%nodePort: %ADMIN_NODE_PORT%
     # Uncomment to export the T3Channel as a service

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/domain-template.yaml

@@ -13,7 +13,6 @@
 
 import io.kubernetes.client.models.ExtensionsV1beta1Deployment;
 import io.kubernetes.client.models.V1Container;
-import io.kubernetes.client.models.V1Job;
 import io.kubernetes.client.models.V1Service;
 import oracle.kubernetes.operator.utils.OperatorYamlFactory;
 
@@ -51,18 +50,6 @@ protected V1Service getExpectedExternalWeblogicOperatorService() {
     return getExpectedExternalWeblogicOperatorService(true, true);
   }
 
-  @Override
-  protected V1Job getExpectedWeblogicOperatorHookJob(String hookType) {
-    V1Job expected = super.getExpectedWeblogicOperatorHookJob(hookType);
-    expected
-        .getSpec()
-        .getTemplate()
-        .getSpec()
-        .addImagePullSecretsItem(
-            newLocalObjectReference().name(getInputs().getWeblogicOperatorImagePullSecretName()));
-    return expected;
-  }
-
   @Override
   public ExtensionsV1beta1Deployment getExpectedWeblogicOperatorDeployment() {
     ExtensionsV1beta1Deployment expected = super.getExpectedWeblogicOperatorDeployment();

kubernetes/src/test/java/oracle/kubernetes/operator/create/CreateOperatorGeneratedFilesOptionalFeaturesEnabledTestBase.java

@@ -21,8 +21,6 @@
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newEnvVar;
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newEnvVarSource;
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newExecAction;
-import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newJob;
-import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newJobSpec;
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newNamespace;
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newObjectFieldSelector;
 import static oracle.kubernetes.operator.utils.KubernetesArtifactUtils.newObjectMeta;
@@ -50,8 +48,6 @@
 import io.kubernetes.client.models.V1ClusterRole;
 import io.kubernetes.client.models.V1ClusterRoleBinding;
 import io.kubernetes.client.models.V1ConfigMap;
-import io.kubernetes.client.models.V1Container;
-import io.kubernetes.client.models.V1Job;
 import io.kubernetes.client.models.V1Namespace;
 import io.kubernetes.client.models.V1Role;
 import io.kubernetes.client.models.V1RoleBinding;
@@ -92,79 +88,6 @@ protected static void setup(OperatorYamlFactory factory, OperatorValues val) thr
     generatedFiles = factory.generate(val);
   }
 
-  @Test
-  public void generatesCorrect_operatorPreInstallHookJob() {
-    assertThat(
-        getActualWeblogicOperatorPreInstallHookJob(),
-        yamlEqualTo(getExpectedWeblogicOperatorPreInstallHookJob()));
-  }
-
-  private V1Job getActualWeblogicOperatorPreInstallHookJob() {
-    return getGeneratedFiles().getOperatorPreInstallHookJob();
-  }
-
-  protected V1Job getExpectedWeblogicOperatorPreInstallHookJob() {
-    return getExpectedWeblogicOperatorHookJob("pre-install");
-  }
-
-  @Test
-  public void generatesCorrect_operatorPreUpgradeHookJob() {
-    assertThat(
-        getActualWeblogicOperatorPreUpgradeHookJob(),
-        yamlEqualTo(getExpectedWeblogicOperatorPreUpgradeHookJob()));
-  }
-
-  private V1Job getActualWeblogicOperatorPreUpgradeHookJob() {
-    return getGeneratedFiles().getOperatorPreUpgradeHookJob();
-  }
-
-  protected V1Job getExpectedWeblogicOperatorPreUpgradeHookJob() {
-    return getExpectedWeblogicOperatorHookJob("pre-upgrade");
-  }
-
-  protected V1Job getExpectedWeblogicOperatorHookJob(String hookType) {
-    V1Job job =
-        newJob()
-            .metadata(
-                newObjectMeta()
-                    .name(OPERATOR_RELEASE + "-weblogic-operator-" + hookType + "-hook")
-                    .namespace(getInputs().getTillerNamespace())
-                    .putLabelsItem(RESOURCE_VERSION_LABEL, OPERATOR_V2)
-                    .putLabelsItem(OPERATORNAME_LABEL, getInputs().getNamespace())
-                    .putAnnotationsItem("helm.sh/hook", hookType)
-                    .putAnnotationsItem(
-                        "helm.sh/hook-delete-policy", "before-hook-creation,hook-succeeded"))
-            .spec(
-                newJobSpec()
-                    .backoffLimit(0)
-                    .template(
-                        newPodTemplateSpec()
-                            .metadata(
-                                newObjectMeta()
-                                    .putLabelsItem(RESOURCE_VERSION_LABEL, OPERATOR_V2)
-                                    .putLabelsItem(OPERATORNAME_LABEL, getInputs().getNamespace()))
-                            .spec(
-                                newPodSpec()
-                                    .restartPolicy("Never")
-                                    .serviceAccount(getInputs().getTillerServiceAccount())
-                                    .addContainersItem(
-                                        newContainer()
-                                            .name("weblogic-operator")
-                                            .image(getInputs().getWeblogicOperatorImage())
-                                            .imagePullPolicy(
-                                                getInputs().getWeblogicOperatorImagePullPolicy())
-                                            .addCommandItem(
-                                                "/operator/operator-helm-verification-hook.sh")
-                                            .addCommandItem(hookType)
-                                            .addCommandItem(getInputs().getNamespace())
-                                            .addCommandItem(getInputs().getServiceAccount())))));
-    V1Container container = job.getSpec().getTemplate().getSpec().getContainers().get(0);
-    for (String targetNamespace : getInputs().getTargetNamespaces().split(",")) {
-      container.addCommandItem(targetNamespace);
-    }
-    return job;
-  }
-
   @Test
   public void generatesCorrect_operatorConfigMap() {
     assertThat(