From 18735514562ffa06ae4591a54b532dc29d22443a Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 17 Jan 2019 14:50:59 -0500 Subject: [PATCH 01/10] update patched image info --- .../create-domain-inputs.yaml | 17 +++++++++-------- .../domain-home-on-pv/create-domain-inputs.yaml | 17 +++++++++-------- site/quickstart.md | 10 ++++------ site/user-guide.md | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml index d0934017121..1f7dae0b82d 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml @@ -11,7 +11,7 @@ adminPort: 7001 adminServerName: admin-server # Unique ID identifying a domain. -# This ID must not contain an underscope ("_"), and must be lowercase and unique across all domains +# This ID must not contain an underscope ("_"), and must be lowercase and unique across all domains # in a Kubernetes cluster. domainUID: domain1 @@ -52,7 +52,7 @@ productionModeEnabled: true # to be used in a registry local to that Kubernetes cluster. You also need to push the `image` to # that registry before starting the domain using the `kubectl create -f` or `kubectl apply -f` command. # See README.md for more help. -#image: +#image: # Image pull policy # Legal values are "IfNotPresent", "Always", or "Never" @@ -63,7 +63,7 @@ imagePullPolicy: IfNotPresent #imagePullSecretName: # Name of the Kubernetes secret for the Admin Server's username and password -# The name must be lowercase. +# The name must be lowercase. # If not specified, the value is derived from the domainUID as -weblogic-credentials weblogicCredentialsSecretName: domain1-weblogic-credentials @@ -107,25 +107,26 @@ namespace: default # Java Option for WebLogic Server javaOptions: -Dweblogic.StdoutDebugEnabled=false -# Name of the persistent volume claim +# Name of the persistent volume claim # If not specified, the value is derived from the domainUID as -weblogic-sample-pvc # This parameter is required if 'logHomeOnPV' is true. # Otherwise, it is ignored. persistentVolumeClaimName: domain1-weblogic-sample-pvc -# Mount path of the domain persistent volume. +# Mount path of the domain persistent volume. # This parameter is required if 'logHomeOnPV' is true. # Otherwise, it is ignored. domainPVMountPath: /shared # Base WebLogic binary image used to build the WebLogic domain image # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. +# The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how -# to create a custom Docker image with the required patch. +# to obtain or create the image. # See README.md for more help. -#domainHomeImageBase: +#domainHomeImageBase: -# Location of the WebLogic "domain home in image" Docker image sample in the +# Location of the WebLogic "domain home in image" Docker image sample in the # `https://github.com/oracle/docker-images.git` project. # If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image". # Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt", diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml index e1e60c9867f..8b235cc0a46 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml @@ -39,8 +39,9 @@ managedServerPort: 8001 # WebLogic Server Docker image. # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. +# The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how -# to create a custom Docker image with the required patch. +# to obtain or create the image. #image: # Image pull policy @@ -55,11 +56,11 @@ imagePullPolicy: IfNotPresent productionModeEnabled: true # Name of the Kubernetes secret for the Admin Server's username and password -# The name must be lowercase. +# The name must be lowercase. # If not specified, the value is derived from the domainUID as -weblogic-credentials weblogicCredentialsSecretName: domain1-weblogic-credentials -# Whether to include server .out to the pod's stdout. +# Whether to include server .out to the pod's stdout. # The default is true. includeServerOutInPodLog: true @@ -91,11 +92,11 @@ namespace: default #Java Option for WebLogic Server javaOptions: -Dweblogic.StdoutDebugEnabled=false -# Name of the persistent volume claim +# Name of the persistent volume claim # If not specified, the value is derived from the domainUID as -weblogic-sample-pvc -persistentVolumeClaimName: domain1-weblogic-sample-pvc +persistentVolumeClaimName: domain1-weblogic-sample-pvc -# Mount path of the domain persistent volume. +# Mount path of the domain persistent volume. domainPVMountPath: /shared # Mount path where the create domain scripts are located inside a pod @@ -112,7 +113,7 @@ createDomainScriptsMountPath: /u01/weblogic # domain home. The script is located in the in-pod directory that is specified in the # `createDomainScriptsMountPath` property. # -# If you need to provide your own scripts to create the domain home, instead of using the +# If you need to provide your own scripts to create the domain home, instead of using the # built-it scripts, you must use this property to set the name of the script that you want # the create domain job to run. createDomainScriptName: create-domain-job.sh @@ -124,7 +125,7 @@ createDomainScriptName: create-domain-job.sh # use the built-in WLST offline scripts in the `wlst` directory to create the WebLogic domain. # It can also be set to the relative path `wdt`, and then the built-in WDT scripts will be # used instead. -# +# # An absolute path is also supported to point to an arbitrary directory in the file system. # # The built-in scripts can be replaced by the user-provided scripts or model files as long diff --git a/site/quickstart.md b/site/quickstart.md index 132b172270c..ddbd71592ef 100644 --- a/site/quickstart.md +++ b/site/quickstart.md @@ -44,13 +44,9 @@ $ docker pull traefik:1.7.4 e. Pull the WebLogic 12.2.1.3 install image: ``` $ docker pull store/oracle/weblogic:12.2.1.3 -``` -f. Then patch the WebLogic image according to the instructions [here](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s), with these modifications: - -* Change the `FROM` clause to extend the `store/oracle/weblogic:12.2.1.3` image from `Dockerfile.patch-ontop-12213`. -* Comment out commands that apply patch 27117282. +``` -g. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access. +f. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access. ## 2. Grant the Helm service account the `cluster-admin` role. @@ -168,6 +164,8 @@ domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`oracle/w * Leaving the `image` empty unless you need to tag the new image that the script builds to a different name. +**NOTE**: Make sure that your `JAVA_HOME` is set to a Java JDK version 1.8 or later. + For example, assuming you named your copy `my-inputs.yaml`: ``` $ cd kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image diff --git a/site/user-guide.md b/site/user-guide.md index 369a0c514af..569ee6bbab1 100644 --- a/site/user-guide.md +++ b/site/user-guide.md @@ -77,5 +77,5 @@ You can find the operator image in * Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`). * Docker 18.03.1.ce (check with `docker version`). * Helm 2.8.2+ (check with `helm version`). -* Oracle WebLogic Server 12.2.1.3.0 with patch 29135930. +* Oracle WebLogic Server 12.2.1.3.0 with patch 29135930. The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. * You must have the `cluster-admin` role to install the operator. From d58f755d944ecb1f81145b20cb844ab18e7fcac2 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 17 Jan 2019 15:34:44 -0500 Subject: [PATCH 02/10] update patch information --- site/weblogic-docker-images.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/site/weblogic-docker-images.md b/site/weblogic-docker-images.md index b49d2f0e545..7cc171d4e05 100644 --- a/site/weblogic-docker-images.md +++ b/site/weblogic-docker-images.md @@ -10,7 +10,7 @@ There are two main options available: If you want to use the first option, you will need to obtain the standard WebLogic Server image from the Docker Store, [see here](#obtaining-standard-images-from-the-docker-store), -and then create a new image with the mandatory patches applied as described in [this section](#creating-a-custom-image-with-patches-applied). +this image already contains the mandatory patches applied as described in [this section](#creating-a-custom-image-with-patches-applied). If you want to use additional patches, you can customize that process to include additional patches. If you want to use the second option, which includes the domain directory @@ -19,7 +19,7 @@ as described in [this section](#creating-a-custom-image-with-your-domain-inside- ## Setting up secrets to access the Docker Store -**Note**: This version of the operator requires WebLogic Server 12.2.1.3.0 plus patch 29135930, so pulling an unpatched image directly to the Kubernetes cluster is not particularly useful. However, we have left this information in the documentation for reference purposes. +**Note**: This version of the operator requires WebLogic Server 12.2.1.3.0 plus patch 29135930, and the standard image `store/oracle/weblogic:12.2.1.3` already includes this patch pre-applied. In order for Kubernetes to obtain the WebLogic Server Docker image from the Docker Store, which requires authentication, a Kubernetes secret containing the registry credentials must be created. To create a secret with Docker Store credentials, issue the following command: @@ -40,7 +40,7 @@ If you choose this approach, you do not require the Kubernetes secret. ## Obtaining standard images from the Docker store Oracle provides a [WebLogic Server 12.2.1.3.0 Docker image](https://store.docker.com/_/oracle-weblogic-server-12c) in the -[Docker Store](https://store.docker.com). To obtain that image, you +[Docker Store](https://store.docker.com) which already has the necessary patches applied. To obtain that image, you must have a Docker Store account, log on to the Docker Store, navigate to that image and click on the "Proceed to Checkout" button which will prompt you to read and accept the license agreement for the image. @@ -65,11 +65,10 @@ Docker Store. ## Creating a custom image with patches applied The Oracle WebLogic Server Kubernetes Operator requires patch 29135930. -This patch does have some prerequisites that will also need to be applied. +This patch does have some prerequisites that will also need to be applied. The standard image `store/oracle/weblogic:12.2.1.3` already has these patches applied. [This sample](https://github.com/oracle/docker-images/blob/master/OracleWebLogic/samples/12213-patch-wls-for-k8s/README.md) in -the Oracle GitHub Docker images repository demonstrates how to create -a patched image. +the Oracle GitHub Docker images repository demonstrates how to create an image with arbitrary patches. You can customize that sample to apply a different set of patches, if you require additional patches or PSUs. When using that sample, you will need to download the required patch and also some prerequisite patches. To find the correct version of the patch, you should From 08d6f6a982976d676fb7bd6e2a4cacc8bc19824e Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 17 Jan 2019 15:37:07 -0500 Subject: [PATCH 03/10] update patching instructions --- site/weblogic-docker-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/weblogic-docker-images.md b/site/weblogic-docker-images.md index 7cc171d4e05..17f426d3e02 100644 --- a/site/weblogic-docker-images.md +++ b/site/weblogic-docker-images.md @@ -68,7 +68,7 @@ The Oracle WebLogic Server Kubernetes Operator requires patch 29135930. This patch does have some prerequisites that will also need to be applied. The standard image `store/oracle/weblogic:12.2.1.3` already has these patches applied. [This sample](https://github.com/oracle/docker-images/blob/master/OracleWebLogic/samples/12213-patch-wls-for-k8s/README.md) in -the Oracle GitHub Docker images repository demonstrates how to create an image with arbitrary patches. You can customize that sample to apply a different set of patches, if you require additional patches or PSUs. +the Oracle GitHub Docker images repository demonstrates how to create an image with arbitrary patches, starting from an unpatched WebLogic Server 12.2.1.3 image (not the standard `store/oracle/weblogic:12.2.1.3` pre-patched image). You can customize that sample to apply a different set of patches, if you require additional patches or PSUs. When using that sample, you will need to download the required patch and also some prerequisite patches. To find the correct version of the patch, you should From 731f52471d1d0978c0028bfa085244a08d10e2dc Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 17 Jan 2019 15:39:28 -0500 Subject: [PATCH 04/10] tighten up language around prereqs already being appplied --- site/weblogic-docker-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/weblogic-docker-images.md b/site/weblogic-docker-images.md index 17f426d3e02..8626d4c60e3 100644 --- a/site/weblogic-docker-images.md +++ b/site/weblogic-docker-images.md @@ -65,7 +65,7 @@ Docker Store. ## Creating a custom image with patches applied The Oracle WebLogic Server Kubernetes Operator requires patch 29135930. -This patch does have some prerequisites that will also need to be applied. The standard image `store/oracle/weblogic:12.2.1.3` already has these patches applied. +This patch does have some prerequisite patches that will also need to be applied. The standard image `store/oracle/weblogic:12.2.1.3` already has all of these patches applied. [This sample](https://github.com/oracle/docker-images/blob/master/OracleWebLogic/samples/12213-patch-wls-for-k8s/README.md) in the Oracle GitHub Docker images repository demonstrates how to create an image with arbitrary patches, starting from an unpatched WebLogic Server 12.2.1.3 image (not the standard `store/oracle/weblogic:12.2.1.3` pre-patched image). You can customize that sample to apply a different set of patches, if you require additional patches or PSUs. From d49af0da0d906f2e3aae85a0d42842f1eb8e5d2d Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Thu, 17 Jan 2019 15:43:39 -0500 Subject: [PATCH 05/10] tighten up samples talk --- site/weblogic-docker-images.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/weblogic-docker-images.md b/site/weblogic-docker-images.md index 8626d4c60e3..a4daee266a3 100644 --- a/site/weblogic-docker-images.md +++ b/site/weblogic-docker-images.md @@ -107,5 +107,9 @@ are provided that demonstrate how to create the image using: * [WebLogic Deploy Tooling](https://github.com/oracle/weblogic-deploy-tooling) to define the domain. +In these samples you will see a reference to a "base" or `FROM` image. You should use an image +with the mandatory patches installed as this base image. This image could be either +the standard `store/oracle/weblogic:12.2.1.3` pre-patched image or an image you created using the instructions above. + **Note**: Oracle recommends that Docker images containing WebLogic domains be kept in a private repository. From ce5e47bd83790c2b33aa030c6bfac56407dd3586 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 17 Jan 2019 16:27:22 -0500 Subject: [PATCH 06/10] incorporate comments --- .../domain-home-in-image/create-domain-inputs.yaml | 3 ++- .../domain-home-on-pv/create-domain-inputs.yaml | 3 ++- site/quickstart.md | 6 ++++-- site/user-guide.md | 5 ++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml index 1f7dae0b82d..00f321da7d3 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml @@ -120,7 +120,8 @@ domainPVMountPath: /shared # Base WebLogic binary image used to build the WebLogic domain image # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. -# The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. +# The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, +# and has all the necessary patches applied; a `docker pull` is required if the you already have this image. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how # to obtain or create the image. # See README.md for more help. diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml index 8b235cc0a46..a35f6ffbc9b 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml @@ -39,7 +39,8 @@ managedServerPort: 8001 # WebLogic Server Docker image. # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. -# The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. +# The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, +# and has all the necessary patches applied; a `docker pull` is required if the you already have this image. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how # to obtain or create the image. #image: diff --git a/site/quickstart.md b/site/quickstart.md index ddbd71592ef..1171ab2ab96 100644 --- a/site/quickstart.md +++ b/site/quickstart.md @@ -42,9 +42,11 @@ d. Pull the Traefik load balancer image: $ docker pull traefik:1.7.4 ``` e. Pull the WebLogic 12.2.1.3 install image: + ``` $ docker pull store/oracle/weblogic:12.2.1.3 ``` +**Note**: The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if the you already have this image. f. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access. @@ -158,13 +160,13 @@ Follow the directions in the [README](../kubernetes/samples/scripts/create-weblo including: * Copying the sample `kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml` file and updating your copy with the `domainUID` (`sample-domain1`), -domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`oracle/weblogic:12213-patch-wls-for-k8s`). +domain namespace (`sample-domain1-ns`), and the `domainHomeImageBase` (`store/oracle/weblogic:12.2.1.3`). * Setting `weblogicCredentialsSecretName` to the name of the secret containing the WebLogic credentials, in this case, `sample-domain1-weblogic-credentials`. * Leaving the `image` empty unless you need to tag the new image that the script builds to a different name. -**NOTE**: Make sure that your `JAVA_HOME` is set to a Java JDK version 1.8 or later. +**NOTE**: If you set the `domainHomeImageBuildPath` property to `./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt`, make sure that your `JAVA_HOME` is set to a Java JDK version 1.8 or later. For example, assuming you named your copy `my-inputs.yaml`: ``` diff --git a/site/user-guide.md b/site/user-guide.md index 569ee6bbab1..f6f92fcd95d 100644 --- a/site/user-guide.md +++ b/site/user-guide.md @@ -77,5 +77,8 @@ You can find the operator image in * Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`). * Docker 18.03.1.ce (check with `docker version`). * Helm 2.8.2+ (check with `helm version`). -* Oracle WebLogic Server 12.2.1.3.0 with patch 29135930. The WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, meets this requirement. +* Oracle WebLogic Server 12.2.1.3.0 with patch 29135930. + * The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, +was updated on January 17, 2019, and has all the necessary patches applied. + * A `docker pull` is required if the you already have this image. * You must have the `cluster-admin` role to install the operator. From 0ef251912856c1dcff1f2af039576221b10cad3d Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Thu, 17 Jan 2019 16:30:36 -0500 Subject: [PATCH 07/10] fix typo --- .../domain-home-in-image/create-domain-inputs.yaml | 2 +- .../domain-home-on-pv/create-domain-inputs.yaml | 2 +- site/quickstart.md | 2 +- site/user-guide.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml index 00f321da7d3..26fafb4664f 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml @@ -121,7 +121,7 @@ domainPVMountPath: /shared # Base WebLogic binary image used to build the WebLogic domain image # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. # The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, -# and has all the necessary patches applied; a `docker pull` is required if the you already have this image. +# and has all the necessary patches applied; a `docker pull` is required if you already have this image. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how # to obtain or create the image. # See README.md for more help. diff --git a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml index a35f6ffbc9b..01356173794 100644 --- a/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml +++ b/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml @@ -40,7 +40,7 @@ managedServerPort: 8001 # WebLogic Server Docker image. # The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. # The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, -# and has all the necessary patches applied; a `docker pull` is required if the you already have this image. +# and has all the necessary patches applied; a `docker pull` is required if you already have this image. # Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how # to obtain or create the image. #image: diff --git a/site/quickstart.md b/site/quickstart.md index 1171ab2ab96..53025325d0c 100644 --- a/site/quickstart.md +++ b/site/quickstart.md @@ -46,7 +46,7 @@ e. Pull the WebLogic 12.2.1.3 install image: ``` $ docker pull store/oracle/weblogic:12.2.1.3 ``` -**Note**: The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if the you already have this image. +**Note**: The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied; a `docker pull` is required if you already have this image. f. Copy the image to all the nodes in your cluster, or put it in a Docker registry that your cluster can access. diff --git a/site/user-guide.md b/site/user-guide.md index f6f92fcd95d..ebb67f61221 100644 --- a/site/user-guide.md +++ b/site/user-guide.md @@ -80,5 +80,5 @@ You can find the operator image in * Oracle WebLogic Server 12.2.1.3.0 with patch 29135930. * The existing WebLogic Docker image, `store/oracle/weblogic:12.2.1.3`, was updated on January 17, 2019, and has all the necessary patches applied. - * A `docker pull` is required if the you already have this image. + * A `docker pull` is required if you already have this image. * You must have the `cluster-admin` role to install the operator. From 47e308b531be0f55b9be40fe4cca4ebce7a6fa50 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Fri, 18 Jan 2019 15:14:54 -0500 Subject: [PATCH 08/10] fix link --- site/user-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/user-guide.md b/site/user-guide.md index ebb67f61221..ceab609b25a 100644 --- a/site/user-guide.md +++ b/site/user-guide.md @@ -26,7 +26,7 @@ presented in the correct order. * [Using the operator's REST interface](rest.md) * [Creating or obtaining WebLogic Docker images](weblogic-docker-images.md) * [Obtaining standard images from the Docker store](weblogic-docker-images.md#obtaining-standard-images-from-the-docker-store) - * [Creating a custom images with patches applied](weblogic-docker-images.md#creating-a-custom-images-with-patches-applied) + * [Creating a custom image with patches applied](weblogic-docker-images.md#creating-a-custom-image-with-patches-applied) * [Creating a custom image with your domain inside the image](weblogic-docker-images.md#creating-a-custom-image-with-your-domain-inside-the-image) * [Create and manage WebLogic domains](domains.md) * [Preparing the Kubernetes cluster to run WebLogic domains](domains.md#preparing-the-kubernetes-cluster-to-run-weblogic-domains) From aff699674dd6bcb1c36b54ed8eaa7531ea345a8c Mon Sep 17 00:00:00 2001 From: Denis Maggiorotto Date: Thu, 24 Jan 2019 00:04:36 +0100 Subject: [PATCH 09/10] Elasticsearch env variables ES_JAVA_OPTS and bootstrap.memory_lock have been added in order to control the memory (useful for running Elasticsearch container in low resources environments (ie: Minishift)) --- .../elasticsearch-and-kibana/elasticsearch_and_kibana.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml b/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml index 63eee2afd77..ae4562d329a 100644 --- a/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml +++ b/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml @@ -47,6 +47,11 @@ spec: ports: - containerPort: 9200 - containerPort: 9300 + env: + - name: ES_JAVA_OPTS + value: -Xms512m -Xmx512m + - name: bootstrap.memory_lock + value: "false" --- kind: "Service" From cb358882131610bd23eb271ce63845f35f6091c1 Mon Sep 17 00:00:00 2001 From: Denis Maggiorotto Date: Thu, 24 Jan 2019 12:14:38 +0100 Subject: [PATCH 10/10] Elasticsearch container memory tuning env variables have been added in order to run the sample also in memory constrained environments modified: kubernetes/samples/scripts/elasticsearch-and-kibana/README.md modified: kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml Signed-off-by: Denis Maggiorotto --- .../samples/scripts/elasticsearch-and-kibana/README.md | 5 +++++ .../elasticsearch-and-kibana/elasticsearch_and_kibana.yaml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kubernetes/samples/scripts/elasticsearch-and-kibana/README.md b/kubernetes/samples/scripts/elasticsearch-and-kibana/README.md index 7b632328692..e0601a3e20f 100644 --- a/kubernetes/samples/scripts/elasticsearch-and-kibana/README.md +++ b/kubernetes/samples/scripts/elasticsearch-and-kibana/README.md @@ -15,6 +15,11 @@ It runs the Elastic Stack on the same host and port that the operator's Helm cha to, therefore, you only need to set `elkIntegrationEnabled` to `true` in your `values.yaml` file. +To control Elasticsearch memory parameters (Heap allocation and Enabling/Disabling swapping) please open the file `elasticsearch_and_kibana.yaml`, search for env variables of the elasticsearch container and change the values of the following. + +* ES_JAVA_OPTS: value may contain for example -Xms512m -Xmx512m to lower the default memory usage (please be aware that this value is only applicable for demo purpose and it is not the one recommended by Elasticsearch itself) +* bootstrap.memory_lock: value may contain true (enables the usage of mlockall to try to lock the process address space into RAM, preventing any Elasticsearch memory from being swapped out) or false (disables the usage of mlockall to try to lock the process address space into RAM, preventing any Elasticsearch memory from being swapped out). + To install Elasticsearch and Kibana, use: ``` $ kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml diff --git a/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml b/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml index ae4562d329a..79ee144ebb6 100644 --- a/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml +++ b/kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml @@ -49,9 +49,9 @@ spec: - containerPort: 9300 env: - name: ES_JAVA_OPTS - value: -Xms512m -Xmx512m + value: -Xms2014m -Xmx1024m - name: bootstrap.memory_lock - value: "false" + value: "true" --- kind: "Service"