Merge remote-tracking branch 'origin/develop' into final-2.0-schema

Author: rjeberhard

integration-tests/README.md

@@ -24,7 +24,7 @@ Quick test use cases.
 4. verify admin t3 channel port by exec into the admin pod and deploying webapp using the channel port for WLST
 5. verify web app load balancing by accessing the webapp using loadBalancerWebPort
 6. verify domain life cycle(destroy and create) should not any impact on Operator managing the domain and web app load balancing and admin external service
-7. cluster scale up/down using Operator REST endpoint, webapp load balancing should adjust accordingly. (run.sh does scaling by editing the replicas in domain-custom-resource.yaml.)
+7. cluster scale up/down using Operator REST endpoint, webapp load balancing should adjust accordingly.
 8. Operator life cycle(destroy and create) should not impact the running domain
 9. verify liveness probe by killing managed server 1 process 3 times to kick pod auto-restart
 10. shutdown the domain by changing domain serverStartPolicy to NEVER

integration-tests/src/test/resources/statedump.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2018, 2019, 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.
 
 
@@ -27,7 +27,6 @@ function state_dump {
 
   mkdir -p ${DUMP_DIR}
 
-  # Test output is captured to ${TESTOUT} when run.sh is run stand-alone
   # if [ -f ${TESTOUT:-NoSuchFile.out} ]; then
    #   echo Copying ${TESTOUT} to ${DUMP_DIR}/test_suite.out
    #   cp ${TESTOUT} ${DUMP_DIR}/test_suite.out

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

@@ -16,7 +16,7 @@ spec:
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
   # If the domain home is in the image
-  domainHomeInImage: false
+  domainHomeInImage: %DOMAIN_HOME_IN_IMAGE%
   # The Operator currently does not support other images
   image: "%WEBLOGIC_IMAGE%"
   # imagePullPolicy defaults to "Always" if image version is :latest
@@ -30,11 +30,13 @@ spec:
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
+  # Whether to enable log home 
+  %LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
   # The in-pod name of the directory to store the domain, node manager, server logs, and server .out
   # files in.
   # If not specified or empty, domain log file, server logs, server out, and node manager log files 
   # will be stored in the default logHome location of /shared/logs/<domainUID>/.
-  logHome: %LOG_HOME%
+  %LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
   # serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
   # - "NEVER" will not start any server in the domain
@@ -48,13 +50,13 @@ spec:
       value: "%JAVA_OPTIONS%"
     - name: USER_MEM_ARGS
       value: "-Xms64m -Xmx256m "
-    volumes:
-    - name: weblogic-domain-storage-volume
-      persistentVolumeClaim:
-        claimName: %DOMAIN_PVC_NAME%
-    volumeMounts:
-    - mountPath: %DOMAIN_ROOT_DIR%
-      name: weblogic-domain-storage-volume
+    %LOG_HOME_ON_PV_PREFIX%volumes:
+    %LOG_HOME_ON_PV_PREFIX%- name: weblogic-domain-storage-volume
+    %LOG_HOME_ON_PV_PREFIX%  persistentVolumeClaim:
+    %LOG_HOME_ON_PV_PREFIX%    claimName: %DOMAIN_PVC_NAME%
+    %LOG_HOME_ON_PV_PREFIX%volumeMounts:
+    %LOG_HOME_ON_PV_PREFIX%- mountPath: %DOMAIN_ROOT_DIR%
+    %LOG_HOME_ON_PV_PREFIX%  name: weblogic-domain-storage-volume
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
     # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -63,11 +65,11 @@ spec:
     serverStartState: "RUNNING"
     %EXPOSE_ANY_CHANNEL_PREFIX%adminService:
     %EXPOSE_ANY_CHANNEL_PREFIX%  channels:
-      # The Admin Server's NodePort
-      %EXPOSE_ADMIN_PORT_PREFIX%- channelName: default
-      %EXPOSE_ADMIN_PORT_PREFIX%  nodePort: %ADMIN_NODE_PORT%
-      # Uncomment to export the T3Channel as a service
-      %EXPOSE_T3_CHANNEL_PREFIX%- channelName: T3Channel
+    # The Admin Server's NodePort
+    %EXPOSE_ADMIN_PORT_PREFIX%   - channelName: default
+    %EXPOSE_ADMIN_PORT_PREFIX%     nodePort: %ADMIN_NODE_PORT%
+    # Uncomment to export the T3Channel as a service
+    %EXPOSE_T3_CHANNEL_PREFIX%   - channelName: T3Channel
   # 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:

kubernetes/samples/scripts/common/utility.sh

@@ -212,6 +212,214 @@ function getKubernetesClusterIP {
   K8S_IP="${array[1]}"
 }
 
+#
+# Function to generate the properties and yaml files for creating a domain
+#
+function createFiles {
+
+  # Make sure the output directory has a copy of the inputs file.
+  # The user can either pre-create the output directory, put the inputs
+  # file there, and create the domain from it, or the user can put the
+  # inputs file some place else and let this script create the output directory
+  # (if needed) and copy the inputs file there.
+  copyInputsFileToOutputDirectory ${valuesInputFile} "${domainOutputDir}/create-domain-inputs.yaml"
+
+  if [ "${domainHomeInImage}" == "true" ]; then
+    if [ -z "${domainHomeImageBase}" ]; then
+      fail "Please specify domainHomeImageBase in your input YAML"
+    fi
+  else
+    if [ -z "${image}" ]; then
+      fail "Please specify image in your input YAML"
+    fi
+  fi
+
+  dcrOutput="${domainOutputDir}/domain.yaml"
+
+  domainName=${domainUID}
+
+  enabledPrefix=""     # uncomment the feature
+  disabledPrefix="# "  # comment out the feature
+
+  exposeAnyChannelPrefix="${disabledPrefix}"
+  if [ "${exposeAdminT3Channel}" = true ]; then
+    exposeAdminT3ChannelPrefix="${enabledPrefix}"
+    exposeAnyChannelPrefix="${enabledPrefix}"
+  else
+    exposeAdminT3ChannelPrefix="${disabledPrefix}"
+  fi
+
+  if [ "${exposeAdminNodePort}" = true ]; then
+    exposeAdminNodePortPrefix="${enabledPrefix}"
+    exposeAnyChannelPrefix="${enabledPrefix}"
+  else
+    exposeAdminNodePortPrefix="${disabledPrefix}"
+  fi
+
+  # For some parameters, use the default value if not defined.
+  if [ -z "${domainPVMountPath}" ]; then
+    domainPVMountPath="/shared"
+  fi
+
+  if [ -z "${logHome}" ]; then
+    logHome="${domainPVMountPath}/logs/${domainUID}"
+  fi
+
+  if [ -z "${persistentVolumeClaimName}" ]; then
+    persistentVolumeClaimName="${domainUID}-weblogic-sample-pvc"
+  fi
+
+  if [ -z "${weblogicCredentialsSecretName}" ]; then
+    weblogicCredentialsSecretName="${domainUID}-weblogic-credentials"
+  fi
+
+  if [ "${domainHomeInImage}" == "true" ]; then
+    domainPropertiesOutput="${domainOutputDir}/domain.properties"
+    domainHome="/u01/oracle/user_projects/domains/${domainName}"
+
+    # Generate the properties file that will be used when creating the weblogic domain
+    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}
+    sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${domainPropertiesOutput}
+    sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${domainPropertiesOutput}
+    sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${domainPropertiesOutput}
+    sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${domainPropertiesOutput}
+
+  else
+
+    createJobOutput="${domainOutputDir}/create-domain-job.yaml"
+    deleteJobOutput="${domainOutputDir}/delete-domain-job.yaml"
+
+    if [ -z "${domainHome}" ]; then
+      domainHome="${domainPVMountPath}/domains/${domainUID}"
+    fi
+
+    # Use the default value if not defined.
+    if [ -z "${createDomainScriptsMountPath}" ]; then
+      createDomainScriptsMountPath="/u01/weblogic"
+    fi
+
+    if [ -z "${createDomainScriptName}" ]; then
+      createDomainScriptName="create-domain-job.sh"
+    fi
+
+    # Must escape the ':' value in image for sed to properly parse and replace
+    image=$(echo ${image} | sed -e "s/\:/\\\:/g")
+
+    # Generate the yaml to create the kubernetes job that will create the weblogic domain
+    echo Generating ${createJobOutput}
+
+    cp ${createJobInput} ${createJobOutput}
+    sed -i -e "s:%NAMESPACE%:$namespace:g" ${createJobOutput}
+    sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${createJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${createJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${createJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${createJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${createJobOutput}
+    sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${createJobOutput}
+    sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${createJobOutput}
+    sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${createJobOutput}
+    sed -i -e "s:%PRODUCTION_MODE_ENABLED%:${productionModeEnabled}:g" ${createJobOutput}
+    sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${createJobOutput}
+    sed -i -e "s:%ADMIN_SERVER_NAME_SVC%:${adminServerNameSVC}:g" ${createJobOutput}
+    sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${createJobOutput}
+    sed -i -e "s:%CONFIGURED_MANAGED_SERVER_COUNT%:${configuredManagedServerCount}:g" ${createJobOutput}
+    sed -i -e "s:%MANAGED_SERVER_NAME_BASE%:${managedServerNameBase}:g" ${createJobOutput}
+    sed -i -e "s:%MANAGED_SERVER_NAME_BASE_SVC%:${managedServerNameBaseSVC}:g" ${createJobOutput}
+    sed -i -e "s:%MANAGED_SERVER_PORT%:${managedServerPort}:g" ${createJobOutput}
+    sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${createJobOutput}
+    sed -i -e "s:%T3_PUBLIC_ADDRESS%:${t3PublicAddress}:g" ${createJobOutput}
+    sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${createJobOutput}
+    sed -i -e "s:%CLUSTER_TYPE%:${clusterType}:g" ${createJobOutput}
+    sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${createJobOutput}
+    sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${createJobOutput}
+    sed -i -e "s:%CREATE_DOMAIN_SCRIPT_DIR%:${createDomainScriptsMountPath}:g" ${createJobOutput}
+    sed -i -e "s:%CREATE_DOMAIN_SCRIPT%:${createDomainScriptName}:g" ${createJobOutput}
+
+    # Generate the yaml to create the kubernetes job that will delete the weblogic domain_home folder
+    echo Generating ${deleteJobOutput}
+
+    cp ${deleteJobInput} ${deleteJobOutput}
+    sed -i -e "s:%NAMESPACE%:$namespace:g" ${deleteJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${deleteJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${deleteJobOutput}
+    sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${deleteJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${deleteJobOutput}
+    sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${deleteJobOutput}
+    sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${deleteJobOutput}
+    sed -i -e "s:%DOMAIN_NAME%:${domainName}:g" ${deleteJobOutput}
+    sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${deleteJobOutput}
+    sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${deleteJobOutput}
+    sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${deleteJobOutput}
+  fi
+
+  if [ "${domainHomeInImage}" == "true" ]; then
+    if [ "${logHomeOnPV}" == "true" ]; then
+      logHomeOnPVPrefix="${enabledPrefix}"
+    else
+      logHomeOnPVPrefix="${disabledPrefix}"
+    fi
+  else
+    logHomeOnPVPrefix="${enabledPrefix}"
+    logHomeOnPV=true
+  fi
+
+  # Generate the yaml file for creating the domain resource
+  echo Generating ${dcrOutput}
+
+  cp ${dcrInput} ${dcrOutput}
+  sed -i -e "s:%DOMAIN_UID%:${domainUID}:g" ${dcrOutput}
+  sed -i -e "s:%NAMESPACE%:$namespace:g" ${dcrOutput}
+  sed -i -e "s:%DOMAIN_HOME%:${domainHome}:g" ${dcrOutput}
+  sed -i -e "s:%DOMAIN_HOME_IN_IMAGE%:${domainHomeInImage}:g" ${dcrOutput}
+  sed -i -e "s:%WEBLOGIC_IMAGE_PULL_POLICY%:${imagePullPolicy}:g" ${dcrOutput}
+  sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%:${imagePullSecretPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%WEBLOGIC_IMAGE_PULL_SECRET_NAME%:${imagePullSecretName}:g" ${dcrOutput}
+  sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${dcrOutput}
+  sed -i -e "s:%INCLUDE_SERVER_OUT_IN_POD_LOG%:${includeServerOutInPodLog}:g" ${dcrOutput}
+  sed -i -e "s:%LOG_HOME_ON_PV_PREFIX%:${logHomeOnPVPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%LOG_HOME_ENABLED%:${logHomeOnPV}:g" ${dcrOutput}
+  sed -i -e "s:%LOG_HOME%:${logHome}:g" ${dcrOutput}
+  sed -i -e "s:%SERVER_START_POLICY%:${serverStartPolicy}:g" ${dcrOutput}
+  sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${dcrOutput}
+  sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${dcrOutput}
+  sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${dcrOutput}
+  sed -i -e "s:%EXPOSE_ANY_CHANNEL_PREFIX%:${exposeAnyChannelPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%EXPOSE_ADMIN_PORT_PREFIX%:${exposeAdminNodePortPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${dcrOutput}
+  sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
+  sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
+  sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
+
+  if [ "${domainHomeInImage}" == "true" ]; then
+    if [ -z $domainHomeImageBuildPath ]; then
+      domainHomeImageBuildPath="./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt"
+    fi
+    imageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
+
+    # now we know which image to use, update the domain yaml file
+    if [ -z $image ]; then
+      sed -i -e "s|%WEBLOGIC_IMAGE%|${imageName}|g" ${dcrOutput}
+    else
+      sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}
+    fi
+  else
+    sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}
+  fi
+
+  # Remove any "...yaml-e" files left over from running sed
+  rm -f ${domainOutputDir}/*.yaml-e
+}
+
 #
 # Function to create the domain recource
 #
@@ -231,8 +439,19 @@ function createDomainResource {
 
 #
 # Function to create a domain
+# $1 - boolean value indicating the location of the domain home
+#      true means domain home in image
+#      false means domain home on PV
 #
 function createDomain {
+  if [ "$#" != 1 ]; then
+    fail "The function must be called with domainHomeInImage parameter."
+  fi
+
+  domainHomeInImage="${1}"
+  if [ "true" != "${domainHomeInImage}" ] && [ "false" != "${domainHomeInImage}" ]; then
+    fail "The value of domainHomeInImage must be true or false: ${domainHomeInImage}"
+  fi
 
   # Setup the environment for running this script and perform initial validation checks
   initialize

kubernetes/samples/scripts/common/validate.sh

@@ -395,3 +395,15 @@ function validateCommonInputs {
   failIfValidationErrors
 }
 
+#
+# Function to validate the domain's persistent volume claim has been created
+#
+function validateDomainPVC {
+  # Check if the persistent volume claim is already available
+  checkPvcExists ${persistentVolumeClaimName} ${namespace}
+  if [ "${PVC_EXISTS}" = "false" ]; then
+    validationError "The domain persistent volume claim ${persistentVolumeClaimName} does not exist in namespace ${namespace}"
+  fi
+  failIfValidationErrors
+}
+