add server pod resource requests and limits to samples

Author: alai8

kubernetes/samples/scripts/common/domain-template.yaml

@@ -47,6 +47,7 @@ spec:
       value: "%JAVA_OPTIONS%"
     - name: USER_MEM_ARGS
       value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
+    %OPTIONAL_SERVERPOD_RESOURCES%
     %LOG_HOME_ON_PV_PREFIX%volumes:
     %LOG_HOME_ON_PV_PREFIX%- name: weblogic-domain-storage-volume
     %LOG_HOME_ON_PV_PREFIX%  persistentVolumeClaim:
@@ -79,4 +80,4 @@ spec:
   experimental:
     istio:
       enabled: %ISTIO_ENABLED%
-      readinessPort: %ISTIO_READINESS_PORT%
+      readinessPort: %ISTIO_READINESS_PORT%

kubernetes/samples/scripts/common/utility.sh

@@ -213,6 +213,42 @@ function getKubernetesClusterIP {
 
 }
 
+#
+# Function to set the serverPodResources variable for including into the generated
+# domain.yaml, base on the serverPod resource requests and limits input values,
+# if specified.
+# The serverPodResources variable remains unset if none of the input values are provided.
+#
+function buildServerPodResources {
+
+  if [ -n "${serverPodMemoryRequest}" ]; then
+    local memoryRequest="        memory\: \"${serverPodMemoryRequest}\"\n"
+  fi
+  if [ -n "${serverPodCpuRequest}" ]; then
+    local cpuRequest="       cpu\: \"${serverPodCpuRequest}\"\n"
+  fi
+  if [ -n "${memoryRequest}" ] || [ -n "${cpuRequest}" ]; then
+    local requests="      requests\: \n$memoryRequest $cpuRequest"
+    echo "requests is $requests"
+  fi
+
+  if [ -n "${serverPodMemoryLimit}" ]; then
+    local memoryLimit="        memory\: \"${serverPodMemoryLimit}\"\n"
+  fi
+  if [ -n "${serverPodCpuLimit}" ]; then
+    local cpuLimit="       cpu\: \"${serverPodCpuLimit}\"\n"
+  fi
+  if [ -n "${memoryLimit}" ] || [ -n "${cpuLimit}" ]; then
+    local limits="      limits\: \n$memoryLimit $cpuLimit"
+    echo "limits is $limits"
+  fi
+
+  if [ -n "${requests}" ] || [ -n "${limits}" ]; then
+    # build resources element and remove last '\n'
+    serverPodResources=$(echo "resources\:\n${requests}${limits}" | sed -e 's/\\n$//')
+  fi
+}
+
 #
 # Function to generate the properties and yaml files for creating a domain
 #
@@ -428,6 +464,13 @@ function createFiles {
   sed -i -e "s:%ISTIO_ENABLED%:${istioEnabled}:g" ${dcrOutput}
   sed -i -e "s:%ISTIO_READINESS_PORT%:${istioReadinessPort}:g" ${dcrOutput}
 
+  buildServerPodResources
+  if [ -z "${serverPodResources}" ]; then
+    sed -i -e "/%OPTIONAL_SERVERPOD_RESOURCES%/d" ${dcrOutput}
+  else
+    sed -i -e "s:%OPTIONAL_SERVERPOD_RESOURCES%:${serverPodResources}:g" ${dcrOutput}
+  fi
+
   if [ "${domainHomeInImage}" == "true" ]; then
 
     # now we know which image to use, update the domain yaml file

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

@@ -134,3 +134,13 @@ domainHomeImageBase: container-registry.oracle.com/middleware/weblogic:12.2.1.3
 # Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt",
 # which uses WDT, instead of WLST, to generate the domain configuration.
 domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image
+
+# Uncomment and edit value(s) below to specify resource requests and limits of 
+# each server pod. This is optional.
+# Please refer to the kubernetes documentation on meaning of the values.
+#
+# serverPodMemoryRequest: "64Mi"
+# serverPodCpuRequest: "250m"
+# serverPodMemoryLimit: "1Gi"
+# serverPodCpuLimit: "1000m"
+

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

@@ -135,10 +135,19 @@ createDomainScriptName: create-domain-job.sh
 # so that the Kubernetes pod can use the scripts and supporting files to create a domain home.
 createDomainFilesDir: wlst
 
+# Uncomment and edit value(s) below to specify resource requests and limits of
+# each server pod. This is optional.
+# Please refer to the kubernetes documentation on meaning of the values.
+#
+# serverPodMemoryRequest: "64Mi"
+# serverPodCpuRequest: "250m"
+# serverPodMemoryLimit: "1Gi"
+# serverPodCpuLimit: "1000m"
+
 # experimental
 # istioEnabled specifies whether or not it is deployed under Istio.
 istioEnabled: false
 
 # experimental
 # istioReadinessPort specifies the WebLogic port for readiness probe which is used under Istio.
-istioReadinessPort: 8888
+istioReadinessPort: 8888