Add customization to create WebLogic domain home scripts #429

doxiao · 2018-09-28T17:23:20Z

Moved out the scripts that are previously inside the create domain configmap into separate files; those files can be replaced by customers' scripts.
Added inputs properties to customize the behavior
Renamed podDomainRootDir to domainPVMountPath
Renamed weblogicImage to image, and weblogicImagePullSecretName to imagePullSecretName
Use env variables instead of string substitution on in the build-in create domain scripts.

(note #4 and #5 addressed review comments)

@rjeberhard @moreaut @tbarnes-us

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

tbarnes-us · 2018-09-28T17:47:52Z

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

+
+  # create the configmap and label it properly
+  kubectl create configmap ${domainUID}-create-weblogic-sample-domain-job-cm -n $namespace --from-file $externalFilesTmpDir
+  kubectl label configmap ${domainUID}-create-weblogic-sample-domain-job-cm -n $namespace weblogic.resourceVersion=domain-v1 weblogic.domainUID=$domainUID weblogic.domainName=$domainName


Fail the script if the map create or label command fails?

tbarnes-us · 2018-09-28T17:50:27Z

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

@@ -0,0 +1,150 @@
+# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.


Ideally, this script should get all of its values from env vars instead of search-and-replace seds...

Not so sure. If I understand the request correctly, we'll expose about the entire domain topology to the create domain job's Pod env.

I think this is helpful as the script isn't easy to edit if it depends on substitution, since it is a hybrid of both a template and a script. An alternative since this is jython: the script could just read the inputs file directly as a properties file (one line of code I think - the current input file is already in prop file format), and then could get the values as props instead of env vars or sed-substitution.

Okay. I'll change the sample script to use env variables then.

...pts/create-weblogic-domain/domain-home-on-pv/create-weblogic-sample-domain-job-template.yaml

moreaut · 2018-09-28T20:25:49Z

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

+  do
+    local outputFile=$fname
+    sed -i -e "s:%NAMESPACE%:$namespace:g" ${outputFile}
+    sed -i -e "s:%WEBLOGIC_CREDENTIALS_SECRET_NAME%:${weblogicCredentialsSecretName}:g" ${outputFile}


Should you match the operator helm chart? It uses 'image', 'imagePullPolicy' and 'imagePullSecrets' (where the secret is the actual list of image pull secrets, instead of just a secret name, which would mean changing the same to parse yaml, instead of simple string values).

I guess we should if we want to have a consistent/better way of doing the same thing. I'll take a look at the operator helm chart.

I am changing the property names to be consistent with what we have in the operator helm charts: weblogicImage -> image, and weblogicImagePullSecretName -> imagePullSecretName. Having discussed with Tom offine, we decided to leave the sample to only support one image pull secret.

moreaut · 2018-09-28T20:26:33Z

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

+    sed -i -e "s:%DOMAIN_PVC_NAME%:${persistentVolumeClaimName}:g" ${outputFile}
+    sed -i -e "s:%DOMAIN_ROOT_DIR%:${domainPVMountPath}:g" ${outputFile}
+    sed -i -e "s:%DOMAIN_LOGS_DIR%:${domainPVMountPath}/logs:g" ${outputFile}
+    sed -i -e "s:%CREATE_DOMAIN_SCRIPT_DIR%:${createDomainScriptsMountPath}:g" ${outputFile}


Do you really want different vars for the create domain script directory and name, instead of just a single pathname?

There can be multiple shell scripts involved in creating the domain home. We need to know the script that the job needs to run.

…x copyright Signed-off-by: doxiao <dongbo.xiao@oracle.com>

… and image pull secrete property names Signed-off-by: doxiao <dongbo.xiao@oracle.com>

rjeberhard · 2018-10-02T13:56:30Z

@doxiao @tbarnes-us @moreaut If comments are addressed, would you please approve the review? Thanks.

tbarnes-us · 2018-10-02T14:17:46Z

@rjeberhard LGTM My comments are about work that should be done, but doesn't need to be in this pull.

Edit: It turns out Dongbo had already addressed the comments. So make that LEGTM

moreaut · 2018-10-02T14:34:11Z

The image, imagePullSecretName changes look good to me.

I just noticed that this sample doesn't support imagePullPolicy.
I don't think we need to hold up the merge for this, but, should we add it later?

doxiao · 2018-10-02T15:17:56Z

I just noticed that this sample doesn't support imagePullPolicy.
I don't think we need to hold up the merge for this, but, should we add it later?

The original create domain job in 1.x does not support imagePullPolicy. It is hardcoded to IfNotPresent. Note that this is the weblogic 12.2.1.3 image. If it is important to support it in the sample, I can add it (either in this PR or the next one).

moreaut · 2018-10-02T15:24:14Z

Hi Dongbo, I think we should add imagePullPolicy eventually - I'm OK if you add it in this PR or in a subsequent one.

doxiao · 2018-10-02T16:14:24Z

Hi Dongbo, I think we should add imagePullPolicy eventually - I'm OK if you add it in this PR or in a subsequent one.

Okay. I'll add it in this PR.

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

doxiao added 4 commits September 26, 2018 14:47

Make sure run.sh has execute permission

19f9fe4

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Add customization for creating WebLogic domain home

8d8a337

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Rename the properties and modified the default handling

ccaf561

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Minor correction in create-domain-job.sh

bdd5b00

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

doxiao requested review from moreaut, rjeberhard and tbarnes-us September 28, 2018 17:23

Remove a redundant log message

1e69736

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

tbarnes-us reviewed Sep 28, 2018

View reviewed changes

moreaut reviewed Sep 28, 2018

View reviewed changes

doxiao added 2 commits September 28, 2018 16:30

Address review comments - add failure handling for cm creation and fi…

96d2cfa

…x copyright Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Use env variables instead of string substitution and change the image…

201957c

… and image pull secrete property names Signed-off-by: doxiao <dongbo.xiao@oracle.com>

doxiao added 2 commits October 2, 2018 10:19

Add imagePullPolicy and checks for os.environ.get() call

8525b2f

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

Add legal values and corrct defult for imagePullPolicy

ecba366

Signed-off-by: doxiao <dongbo.xiao@oracle.com>

moreaut approved these changes Oct 2, 2018

View reviewed changes

rjeberhard merged commit aa71c37 into develop Oct 4, 2018

rjeberhard deleted the owls68835_add_customization branch December 15, 2018 19:49

		@@ -0,0 +1,150 @@
		# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.

Add customization to create WebLogic domain home scripts #429

Add customization to create WebLogic domain home scripts #429

Uh oh!

Conversation

doxiao commented Sep 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rjeberhard commented Oct 2, 2018

Uh oh!

tbarnes-us commented Oct 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

moreaut commented Oct 2, 2018

Uh oh!

doxiao commented Oct 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

moreaut commented Oct 2, 2018

Uh oh!

doxiao commented Oct 2, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

doxiao commented Sep 28, 2018 •

edited

Loading

tbarnes-us commented Oct 2, 2018 •

edited

Loading

doxiao commented Oct 2, 2018 •

edited

Loading