Merge pull request #738 from oracle/develop

Catch master up to fix work on develop

Author: rjeberhard

README.md

@@ -35,7 +35,6 @@ The fastest way to experience the operator is to follow the [Quick start guide](
 | [#721](https://github.com/oracle/weblogic-kubernetes-operator/issues/721) | Incorrect default `domainHome` when `domainHomeInImage` is true. |
 | [#722](https://github.com/oracle/weblogic-kubernetes-operator/issues/722) | Server services not recreated when labels/annotations changed. |
 | [#726](https://github.com/oracle/weblogic-kubernetes-operator/issues/726) | Clusters only support default channel. |
-| [#727](https://github.com/oracle/weblogic-kubernetes-operator/issues/727) | The `listen-address` and log directories may be incorrect (pods may not start). |
 
 ## Operator version 1.1
 

operator/src/main/resources/scripts/introspectDomain.py

@@ -603,6 +603,14 @@ def addServerTemplates(self):
     self.undent()
 
   def addServerTemplate(self, serverTemplate):
+    # TBD This looks wrong.  It should match addClusteredServer.
+    #     It adds default port & listen address. But:
+    #       It's missing adding admin port, SSL, and NAPs.
+    #       It reports the wrong listen address (original rather than overridden).
+    #     Probably tests are passing fine, as it's likely (A)
+    #     the Operator.java is only reading the port, and (B) cluster tests
+    #     are only looking at the cluster default port.
+    #     So:  Follow up and fix this, and file test JIRAs for tests.
     name=self.name(serverTemplate)
     self.writeln("- name: " + name)
     if serverTemplate.isListenPortEnabled():
@@ -803,28 +811,34 @@ def customizeServers(self):
     for server in self.env.getDomain().getServers():
       self.customizeServer(server)
 
+  def writeListenAddress(self, originalValue, newValue):
+    repVerb="\"replace\""
+    if originalValue is None or len(originalValue)==0:
+      repVerb="\"add\""
+    self.writeln("<d:listen-address f:combine-mode=" + repVerb + ">" + newValue + "</d:listen-address>")
+
   def customizeServer(self, server):
     name=server.getName()
     listen_address=self.env.toDNS1123Legal(self.env.getDomainUID() + "-" + name)
     self.writeln("<d:server>")
     self.indent()
     self.writeln("<d:name>" + name + "</d:name>")
-    self.writeln("<d:listen-address f:combine-mode=\"replace\">" + listen_address + "</d:listen-address>")
-    if server.getSSL():
-      self.writeln("<d:ssl>")
-      self.indent()
-      self.writeln("<d:listen-address f:combine-mode=\"replace\">" + listen_address + "</d:listen-address>")
-      self.undent()
-      self.writeln("</d:ssl>")
+    self.customizeLog(name, server, false)
+    self.writeListenAddress(server.getListenAddress(),listen_address)
     for nap in server.getNetworkAccessPoints():
+      # Don't bother 'add' a nap listen-address, only do a 'replace'.
+      # If we try 'add' this appears to mess up an attempt to 
+      #   'add' PublicAddress/Port via custom sit-cfg.
+      # FWIW there's theoretically no need to 'add' or 'replace' when empty
+      #   since the runtime default is the server listen-address.
       nap_name=nap.getName()
-      self.writeln("<d:network-access-point>")
-      self.indent()
-      self.writeln("<d:name>" + nap_name + "</d:name>")
-      self.writeln("<d:listen-address f:combine-mode=\"replace\">" + listen_address + "</d:listen-address>")
-      self.undent()
-      self.writeln("</d:network-access-point>")
-    self.customizeLog(name, server, false)
+      if not (nap.getListenAddress() is None) and len(nap.getListenAddress()) > 0:
+        self.writeln("<d:network-access-point>")
+        self.indent()
+        self.writeln("<d:name>" + nap_name + "</d:name>")
+        self.writeListenAddress("force a replace",listen_address)
+        self.undent()
+        self.writeln("</d:network-access-point>")
     self.undent()
     self.writeln("</d:server>")
 
@@ -839,8 +853,8 @@ def customizeServerTemplate(self, template):
     self.writeln("<d:server-template>")
     self.indent()
     self.writeln("<d:name>" + name + "</d:name>")
-    self.writeln("<d:listen-address f:combine-mode=\"replace\">" + listen_address + "</d:listen-address>")
     self.customizeLog(server_name_prefix + "${id}", template, false)
+    self.writeListenAddress(template.getListenAddress(),listen_address)
     self.undent()
     self.writeln("</d:server-template>")
 

operator/src/main/resources/scripts/startNodeManager.sh

@@ -111,6 +111,12 @@ createFolder ${NODEMGR_HOME}
 
 NODEMGR_LOG_HOME=${NODEMGR_LOG_HOME:-${LOG_HOME:-${NODEMGR_HOME}/${DOMAIN_UID}}}
 
+trace "Info: NODEMGR_HOME='${NODEMGR_HOME}'"
+trace "Info: LOG_HOME='${LOG_HOME}'"
+trace "Info: SERVER_NAME='${SERVER_NAME}'"
+trace "Info: DOMAIN_UID='${DOMAIN_UID}'"
+trace "Info: NODEMGR_LOG_HOME='${NODEMGR_LOG_HOME}'"
+
 createFolder ${NODEMGR_LOG_HOME}
 
 nodemgr_log_file=${NODEMGR_LOG_HOME}/${SERVER_NAME}_nodemanager.log

site/quickstart.md

@@ -32,9 +32,10 @@ b.  Log in to the Docker Store from your docker client:
 ```
 $ docker login
 ```
-c.	Pull the operator image:
+c.	Pull the operator image and tag it to the default image value of the operator:
 ```
-$ docker pull oracle/weblogic-kubernetes-operator:2.0
+$ docker pull oracle/weblogic-kubernetes-operator:2.0-rc1
+$ docker tag oracle/weblogic-kubernetes-operator:2.0-rc1 weblogic-kubernetes-operator:2.0
 ```
 d.	Pull the Traefik load balancer image:
 ```
@@ -70,17 +71,14 @@ EOF
 
 Use `helm` to install the [Traefik](../kubernetes/samples/charts/traefik/README.md) load balancer. Use the [values.yaml](../kubernetes/samples/charts/traefik/values.yaml) in the sample but set `kubernetes.namespaces` specifically.
 ```
-$ helm install \
+$ helm install stable/traefik \
 --name traefik-operator \
 --namespace traefik \
---values <path>/values.yaml  \
+--values kubernetes/samples/charts/traefik/values.yaml  \
 --set "kubernetes.namespaces={traefik}" \
-stable/traefik
-```
-Wait until the Traefik operator pod is running and ready.
-```
-$ kubectl -n traefik get pod -w
+--wait
 ```
+
 ## 3. Install the operator.
 
 a.  Create a namespace for the operator:
@@ -137,21 +135,18 @@ c.  Configure Traefik to manage Ingresses created in this namespace:
 $ helm upgrade \
   --reuse-values \
   --set "kubernetes.namespaces={traefik,sample-domain1-ns}" \
+  --wait \
   traefik-operator \
   stable/traefik
 ```
-d. Wait until the Traefik operator pod finishes restarting.
-```
-$ kubectl -n traefik get pod -w
-```
 
 ## 5. Create a domain in the domain namespace.
 
 a. Create a Kubernetes secret containing the `username` and `password` for the domain using the [`create-weblogic-credentials`](../kubernetes/samples/scripts/create-weblogic-domain-credentials/create-weblogic-credentials.sh) script:
 
 ```
-$ cd kubernetes/samples/scripts/create-weblogic-domain-credentials
-$ ./create-weblogic-credentials.sh -u weblogic -p welcome1 -n sample-domain1-ns -d sample-domain1
+$ kubernetes/samples/scripts/create-weblogic-domain-credentials/create-weblogic-credentials.sh \
+  -u weblogic -p welcome1 -n sample-domain1-ns -d sample-domain1
 ```
 
 The sample will create a secret named `domainUID-weblogic-credentials` where the `domainUID` is replaced
@@ -199,16 +194,19 @@ $ kubectl get services -n sample-domain1-ns
 d.	Create an Ingress for the domain, in the domain namespace, by using the [sample](../kubernetes/samples/charts/ingress-per-domain/README.md) Helm chart:
 * Use `helm install`, specifying the `domainUID` (`sample-domain1`) and domain namespace (`sample-domain1-ns`) in the `values.yaml` file.
 ```
-$ cd kubernetes/samples/charts
-$ helm install ingress-per-domain --name domain1-ingress --values ingress-per-domain/values.yaml
+$ helm install kubernetes/samples/charts/ingress-per-domain \
+  --name sample-domain1-ingress \
+  --set wlsDomain.namespace=sample-domain1-ns \
+  --set wlsDomain.domainUID=sample-domain1 \
+  --set traefik.hostname=sample-domain1.org
 ```
 
 e.	To confirm that the load balancer noticed the new Ingress and is successfully routing to the domain's server pods
     you can hit the URL for the "WebLogic Ready App" which will return a HTTP 200 status code as
     shown in the example below.  If you used the host-based routing ingress sample you will need to
     provide the hostname in the `-H` option:
 ```
-$ curl -v -H 'host: domain1.org' http://your.server.com:30305/weblogic/

+$ curl -v -H 'host: sample-domain1.org' http://your.server.com:30305/weblogic/

 *
About to connect() to your.server.com port 30305 (#0)

 *   Trying 10.196.1.64...

 * Connected to your.server.com (10.196.1.64) port 30305 (#0)
@@ -230,10 +228,12 @@ update security lists to allow ingress to this port.
 
 a.	Remove the domain's Ingress by using `helm`:
 ```
-$ helm delete --purge domain1-ingress
+$ helm delete --purge sample-domain1-ingress
 ```
 b.	Remove the domain resources by using the sample [`delete-weblogic-domain-resources`](../kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh) script.
-
+```
+$ kubernetes/samples/scripts/delete-domain/delete-weblogic-domain-resources.sh -d sample-domain1
+```
 c.	Use `kubectl` to confirm that the server pods and domain resource are gone.
 ```
 $ kubectl get pods -n sample-domain1-ns
@@ -247,6 +247,7 @@ a.	Configure the Traefik load balancer to stop managing the Ingresses in the dom
 $ helm upgrade \
   --reuse-values \
   --set "kubernetes.namespaces={traefik}" \
+  --wait \
   traefik-operator \
   stable/traefik
 ```

src/integration-tests/introspector/checkBeans.inputt

@@ -1,4 +1,7 @@
+/Log/base_domain,FileName,logs/base_domain.log,/shared/logs/base_domain.log
+
 /Servers/${ADMIN_NAME},ListenAddress,,${DOMAIN_UID}-${ADMIN_NAME}
+
 /Servers/${ADMIN_NAME}/Log/${ADMIN_NAME},FileName,logs/${ADMIN_NAME}.log,/shared/logs/${ADMIN_NAME}.log
 
 /Servers/${ADMIN_NAME}/NetworkAccessPoints/T3Channel1,ListenAddress,unresolvable-dns-name,${DOMAIN_UID}-${ADMIN_NAME}
@@ -17,6 +20,9 @@
 /Servers/standalone1,MaxMessageSize,7777777,1111111
 /Servers/standalone2,MaxMessageSize,10000000,2222222
 
+/ServerTemplates/mycluster-template/Log/mycluster-template,FileName,logs/mycluster-template.log,/shared/logs/managed-server${id}.log
+/ServerTemplates/mycluster-template,ListenAddress,None,domain1-managed-server${id}
+
 /JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,Url,jdbc:oracle:thin:@myoriginalhostname:1521:myoriginalsid,jdbc:oracle:thin:@mynewhost:1521:mynewsid
 /JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS,PasswordEncrypted,*,!
 /JDBCSystemResources/testDS/JDBCResource/testDS/JDBCDriverParams/testDS/Properties/testDS/Properties/user,Value,scott,supersecret

src/integration-tests/introspector/introspectTest.sh

@@ -179,14 +179,20 @@ function cleanupMajor() {
 function cleanupMinor() {
   trace "Info: RERUN_INTROSPECT_ONLY==true, skipping cleanup.sh and domain home setup, and only deleting wl pods + introspector job."
 
-  kubectl -n $NAMESPACE delete pod ${DOMAIN_UID}-${ADMIN_NAME} > /dev/null 2>&1
-  kubectl -n $NAMESPACE delete pod ${DOMAIN_UID}-${MANAGED_SERVER_NAME_BASE}1 > /dev/null 2>&1
-  kubectl -n $NAMESPACE delete job ${DOMAIN_UID}-introspect-domain-job > /dev/null 2>&1
+  kubectl -n $NAMESPACE delete pod ${DOMAIN_UID}-${ADMIN_NAME}                --grace-period=2 > /dev/null 2>&1
+  kubectl -n $NAMESPACE delete pod ${DOMAIN_UID}-${MANAGED_SERVER_NAME_BASE}1 --grace-period=2 > /dev/null 2>&1
+  kubectl -n $NAMESPACE delete job ${DOMAIN_UID}-introspect-domain-job        --grace-period=2 > /dev/null 2>&1
+  kubectl -n $NAMESPACE delete pod ${DOMAIN_UID}--introspect-domain-pod       --grace-period=2 > /dev/null 2>&1
   rm -fr ${test_home}/jobfiles
   tracen "Info: Waiting for wl pods to completely go away before continuing."
   while [ 1 -eq 1 ]; do
     echo -n "."
-    [ "`kubectl -n ${NAMESPACE} get pods | grep '${DOMAIN_UID}.*server'`" = "" ] && break
+    # echo
+    # echo "Waiting for: '`kubectl -n ${NAMESPACE} get pods | grep \"${DOMAIN_UID}.*server\"`'"
+    # echo "Waiting for: '`kubectl -n ${NAMESPACE} get pods | grep \"${DOMAIN_UID}.*introspect\"`'"
+    [ "`kubectl -n ${NAMESPACE} get pods | grep \"${DOMAIN_UID}.*server\"`" = "" ] \
+     && [ "`kubectl -n ${NAMESPACE} get pods | grep \"${DOMAIN_UID}.*introspect\"`" = "" ] \
+     && break
     sleep 1
   done
   echo
@@ -339,7 +345,7 @@ function deployTestScriptConfigMap() {
   cp ${SCRIPTPATH}/introspectDomainProxy.sh ${test_home}/test-scripts || exit 1
 
   if [ "$CREATE_DOMAIN" = "true" ]; then
-    rm -f ${test_home}/scripts/createDomain.py
+    rm -f ${test_home}/test-scripts/createDomain.py
     ${SCRIPTPATH}/util_subst.sh -g createDomain.pyt ${test_home}/test-scripts/createDomain.py || exit 1
   fi
 
@@ -498,19 +504,15 @@ function deployIntrospectJobPod() {
 
   trace "Info: Run introspection job, parse its output to files, and put files in configmap '$introspect_output_cm_name'."
 
-  # delete anything left over from a previous invocation of this function
+  # delete anything left over from a previous invocation of this function, assume all pods
+  # have already been cleaned up
+
+  rm -f ${target_yaml}
 
   kubectl -n $NAMESPACE delete cm $introspect_output_cm_name \
     --ignore-not-found  \
     2>&1 | tracePipe "Info: kubectl output: "
 
-  if [ -f "${target_yaml}" ]; then
-    kubectl -n $NAMESPACE delete -f ${target_yaml} \
-      --ignore-not-found \
-      2>&1 | tracePipe "Info: kubectl output: "
-    rm -f ${target_yaml}
-  fi
-
   trace "Info: Deploying job pod '$pod_name' and waiting for it to be ready."
 
   (
@@ -755,11 +757,13 @@ function checkOverrides() {
 #     matches
 #
 
+
 kubectl -n $NAMESPACE delete secret my-secret > /dev/null 2>&1
 kubectl -n $NAMESPACE create secret generic my-secret \
         --from-literal=key1=supersecret  \
         --from-literal=key2=topsecret 2>&1 | tracePipe "Info: kubectl output: "
 
+
 if [ ! "$RERUN_INTROSPECT_ONLY" = "true" ]; then
 
   cleanupMajor
@@ -785,9 +789,13 @@ else
 
   cleanupMinor
 
+  deployDomainConfigMap
+  deployTestScriptConfigMap
   deployCustomOverridesConfigMap
-  deployIntrospectJob
+  #deployIntrospectJob
+  deployIntrospectJobPod
   deployPod ${ADMIN_NAME?}
+  deployPod ${MANAGED_SERVER_NAME_BASE?}1
 
 fi
 

src/integration-tests/introspector/util_subst.sh

@@ -100,7 +100,7 @@ sed -i -e 's;${[a-zA-Z0-9_][a-zA-Z0-9_]*:-\([^}]*\)};\1;g' $tfilename
 # On a failure, helpfully list the problem lines in the input file
 # along with the line numbers.
 
-count="`grep -v 'subst-ignore-missing' $tfilename | grep -v 'env:' | grep -v 'secret:' | grep -c '\${'`"
+count="`grep -v 'subst-ignore-missing' $tfilename | grep -v 'env:' | grep -v 'secret:' | grep -v '\${id}' | grep -c '\${'`"
 if [ $count -gt 0 ]; then
   trace "Debug: Error, found unresolved variables in file '$sfilename':"
   grep -n "\${" $tfilename | sed 's/^/@  line /' | grep -v 'subst-ignore-missing'