Merge remote-tracking branch 'origin/master' into develop

Author: rjeberhard

docs-source/content/release-notes.md

@@ -9,6 +9,7 @@ draft: false
 | Date | Version | Introduces backward incompatibilities? | Change |
 | --- | --- | --- | --- |
 | December ??, 2020 | v3.2.0 | no | Placeholder |
+| December 17, 2020 | v3.1.1 | no | Resolved an issue that caused unexpected server restarts when the domain had multiple WebLogic clusters. |
 | November 24, 2020 | v3.0.4 | no | This release contains a back-ported fix from 3.1.0 for Managed Server pods that do not properly restart following a rolling activity. |
 | November 13, 2020 | v3.1.0 | no | Enhanced options for specifying managed namespaces. Helm 3.1.3+ now required. Added support for Tanzu Kubernetes Service. |
 | November 9, 2020 | v3.0.3 | no | This release contains a fix for pods that are stuck in the Terminating state after an unexpected shut down of a worker node. |
@@ -35,6 +36,10 @@ draft: false
 
 #### Operator 3.2.0
 
+#### Operator 3.1.1
+
+* Resolved an issue that caused unexpected server restarts when the domain had multiple WebLogic clusters ([#2109](https://github.com/oracle/weblogic-kubernetes-operator/pull/2109)).
+
 #### Operator 3.1.0
 
 * All fixes included in 3.0.1, 3.0.2, and 3.0.3 are included in 3.1.0.

docs/charts/index.yaml

@@ -3,17 +3,27 @@ entries:
   weblogic-operator:
   - apiVersion: v1
     appVersion: 3.2.0
-    created: "2020-11-24T15:17:04.934226-05:00"
+    created: "2020-12-17T16:03:53.366539-05:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: f8ae82202c3c401d290bffb5c33e6825158f0e9958aa8ba862bdfc79d19f502d
+    digest: 985a16a9cdce484975e0a354ee317d73f14c65b6aa8339829b4a81f4c87b3ea9
     name: weblogic-operator
     type: application
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.2.0.tgz
     version: 3.2.0
+  - apiVersion: v1
+    appVersion: 3.1.1
+    created: "2020-12-17T16:03:53.364958-05:00"
+    description: Helm chart for configuring the WebLogic operator.
+    digest: 202d148fd3db1ce45d22d4eab3e84bea9bf774addd9e0bc65f9312207a6e4968
+    name: weblogic-operator
+    type: application
+    urls:
+    - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.1.tgz
+    version: 3.1.1
   - apiVersion: v1
     appVersion: 3.1.0
-    created: "2020-11-24T15:17:04.931364-05:00"
+    created: "2020-12-17T16:03:53.362988-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: acf600d0951dc3d8a0b05b35f3b9b1e62d827ef483fa863b0e37054ebb61f853
     name: weblogic-operator
@@ -22,123 +32,123 @@ entries:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.0.tgz
     version: 3.1.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.92962-05:00"
+    created: "2020-12-17T16:03:53.36021-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 5d3a79a55132c33afd5d2d30e398c3cc508d77c9352129f2e8e127db5f1dcf19
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.4.tgz
     version: 3.0.4
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.928192-05:00"
+    created: "2020-12-17T16:03:53.357301-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: c6aeefca88eaa0d431dba66ee5705391c92468f26b27c5af92815ec3c3000406
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.3.tgz
     version: 3.0.3
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.926742-05:00"
+    created: "2020-12-17T16:03:53.355678-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 84b5989fe8f2392d2b3b0f721bdab1562566d7d885324beafd9fc9e658b13cd3
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.2.tgz
     version: 3.0.2
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.925279-05:00"
+    created: "2020-12-17T16:03:53.35362-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: e7654ad3f2168f54b3a4b133bf8a86ea12bc474e5ee1d3ab14e1cf53012e9772
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.1.tgz
     version: 3.0.1
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.923992-05:00"
+    created: "2020-12-17T16:03:53.35225-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 5c7c0d3ae797e98592b6fd2191b104f515d6649d0060af0a3ffef215d4c69864
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0.tgz
     version: 3.0.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.922667-05:00"
+    created: "2020-12-17T16:03:53.35103-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
     version: 3.0.0-rc1
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.921229-05:00"
+    created: "2020-12-17T16:03:53.349662-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: d441888a8deae1b1339e7585e3b437dfd2533303e46e842d7378e16db665e234
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
     version: 2.6.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.919874-05:00"
+    created: "2020-12-17T16:03:53.348458-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
     version: 2.5.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.918262-05:00"
+    created: "2020-12-17T16:03:53.347153-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
     version: 2.4.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.916513-05:00"
+    created: "2020-12-17T16:03:53.346054-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
     version: 2.3.1
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.911685-05:00"
+    created: "2020-12-17T16:03:53.341956-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.910195-05:00"
+    created: "2020-12-17T16:03:53.340651-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.908716-05:00"
+    created: "2020-12-17T16:03:53.337177-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.907085-05:00"
+    created: "2020-12-17T16:03:53.335792-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
   - apiVersion: v1
-    created: "2020-11-24T15:17:04.905466-05:00"
+    created: "2020-12-17T16:03:53.334567-05:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: "2020-11-24T15:17:04.900779-05:00"
+generated: "2020-12-17T16:03:53.332743-05:00"

docs/charts/weblogic-operator-3.1.1.tgz

@@ -97,10 +97,11 @@ public NextAction apply(Packet packet) {
     }
 
     if (!work.isEmpty()) {
-      return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet, work);
+      return doForkJoin(DomainStatusUpdater.createStatusUpdateStep(
+              new ManagedServerUpAfterStep(getNext())), packet, work);
     }
 
-    return doNext(DomainStatusUpdater.createStatusUpdateStep(getNext()), packet);
+    return doNext(DomainStatusUpdater.createStatusUpdateStep(new ManagedServerUpAfterStep(getNext())), packet);
   }
 
 
@@ -170,7 +171,7 @@ void add(StepAndPacket serverToStart) {
     public NextAction apply(Packet packet) {
 
       if (startDetailsQueue.isEmpty()) {
-        return doNext(new ManagedServerUpAfterStep(getNext()), packet);
+        return doNext(packet);
       } else if (hasServerAvailableToStart(packet)) {
         numStarted.getAndIncrement();
         return doForkJoin(this, packet, Collections.singletonList(startDetailsQueue.poll()));