Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into develop-operator-helm-chart-values-cleanup

Author: moreaut

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

@@ -101,9 +101,3 @@ elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 # 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'

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

@@ -285,11 +285,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"
@@ -44,47 +32,35 @@ spec:
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
+  env:
+  - name: JAVA_OPTIONS
+    value: "%JAVA_OPTIONS%"
+  - name: USER_MEM_ARGS
+    value: "-Xms64m -Xmx256m "
+  volumes:
+  - name: runtime-properties
+    hostPath:
+      path: "%RUNTIME_PROPERTIES%"
+  volumeMounts:
+  - mountPath: "/u01/oracle/properties"
+    name: runtime-properties
   # 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
     %EXPOSE_T3_CHANNEL_PREFIX%exportedNetworkAccessPoints:
     %EXPOSE_T3_CHANNEL_PREFIX%  T3Channel: {}
     # an (optional) list of environment variable to be set on the server
-    env:
-    - name: JAVA_OPTIONS
-      value: "%JAVA_OPTIONS%"
-    - name: USER_MEM_ARGS
-      value: "-Xms64m -Xmx256m "
-    volumes:
-    - name: runtime-properties
-      hostPath:
-        path: "%RUNTIME_PROPERTIES%"
-    volumeMounts:
-    - name: runtime-properties
-      mountPath: "/u01/oracle/properties"
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
     %CLUSTER_NAME%:
       serverStartState: "RUNNING"
       replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
-      env:
-      - name: JAVA_OPTIONS
-        value: "%JAVA_OPTIONS%"
-      - name: USER_MEM_ARGS
-        value: "-Xms64m -Xmx256m "
-      volumes:
-      - name: runtime-properties
-        hostPath:
-          path: "%RUNTIME_PROPERTIES%"
-      volumeMounts:
-      - name: runtime-properties
-        mountPath: "/u01/oracle/properties"
   # The number of managed servers to start from clusters not listed in clusters
   # replicas: 1

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();