Operator version 3.1.1 (#2108)

* Prepare for 3.1.1 * OWLS-86552 - Fix for multiple pod restarts during rolling update. ManagedServerUpAfterStep is executed after servers in all clusters started. (#2109) * Add PR reference Co-authored-by: Anil Kedia <[email protected]>
oracle · Dec 17, 2020 · 4e82c40 · 4e82c40
1 parent 60fafcd
commit 4e82c40
Show file tree

Hide file tree

Showing 26 changed files with 63 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
 The fastest way to experience the operator is to follow the [Quick Start guide](https://oracle.github.io/weblogic-kubernetes-operator/quickstart/), or you can peruse our [documentation](https://oracle.github.io/weblogic-kubernetes-operator), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples](https://oracle.github.io/weblogic-kubernetes-operator/samples/).
 
 ***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.1.0.
-This release was published on November 13, 2020.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.1.1.
+This release was published on December 17, 2020.
 ***
 
 # Documentation

diff --git a/buildDockerImage.sh b/buildDockerImage.sh
@@ -33,7 +33,7 @@ while getopts "t:" optname; do
   esac
 done
 
-IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:3.1.0}
+IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:3.1.1}
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
 # Proxy settings

diff --git a/buildtime-reports/pom.xml b/buildtime-reports/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>buildtime-reports</artifactId>

diff --git a/docs-source/content/_index.md b/docs-source/content/_index.md
@@ -23,8 +23,8 @@ using the operator to deploy and run a WebLogic domain container-packaged web ap
 ***
 #### Current production release
 
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.1.0.
-This release was published on November 13, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.1.1.
+This release was published on December 17, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
 
 ***
 

diff --git a/docs-source/content/faq/namespace-management.md b/docs-source/content/faq/namespace-management.md
@@ -43,7 +43,7 @@ elkIntegrationEnabled: false
 externalDebugHttpPort: 30999
 externalRestEnabled: false
 externalRestHttpsPort: 31001
-image: oracle/weblogic-kubernetes-operator:3.1.0
+image: oracle/weblogic-kubernetes-operator:3.1.1
 imagePullPolicy: IfNotPresent
 internalDebugHttpPort: 30999
 istioEnabled: false

diff --git a/docs-source/content/quickstart/get-images.md b/docs-source/content/quickstart/get-images.md
@@ -19,7 +19,7 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
 1. Pull the operator image:
 
     ```bash
-    $ docker pull oracle/weblogic-kubernetes-operator:3.1.0
+    $ docker pull oracle/weblogic-kubernetes-operator:3.1.1
     ```
 
 1. Pull the Traefik ingress controller image:

diff --git a/docs-source/content/quickstart/install.md b/docs-source/content/quickstart/install.md
@@ -51,7 +51,7 @@ $ helm install traefik-operator traefik/traefik \
     ```bash
     $ helm install sample-weblogic-operator kubernetes/charts/weblogic-operator \
       --namespace sample-weblogic-operator-ns \
-      --set image=oracle/weblogic-kubernetes-operator:3.1.0 \
+      --set image=oracle/weblogic-kubernetes-operator:3.1.1 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "enableClusterRoleBinding=true" \
       --set "domainNamespaceSelectionStrategy=LabelSelector" \

diff --git a/docs-source/content/release-notes.md b/docs-source/content/release-notes.md
@@ -8,6 +8,7 @@ draft: false
 
 | Date | Version | Introduces backward incompatibilities? | Change |
 | --- | --- | --- | --- |
+| 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. |
@@ -32,6 +33,10 @@ draft: false
 
 ### Change log
 
+#### 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.

diff --git a/docs-source/content/userguide/introduction/architecture.md b/docs-source/content/userguide/introduction/architecture.md
@@ -18,7 +18,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
 
 ```
 $ docker login
-$ docker pull oracle/weblogic-kubernetes-operator:3.1.0
+$ docker pull oracle/weblogic-kubernetes-operator:3.1.1
 ```
 
 For more details on acquiring the operator image and prerequisites for installing the operator, consult the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}).

diff --git a/docs-source/content/userguide/introduction/introduction.md b/docs-source/content/userguide/introduction/introduction.md
@@ -16,7 +16,7 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
 
 ### Operator prerequisites
 
-For the current production release 3.1.0:
+For the current production release 3.1.1:
 
 * Kubernetes 1.14.8+, 1.15.7+, 1.16.0+, 1.17.0+, and 1.18.0+ (check with `kubectl version`).
 * Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`), Calico networking (Calico v3.16.1),

diff --git a/docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md b/docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md
@@ -188,7 +188,7 @@ d. Update the `image` field of the Domain YAML file, specifying the new image na
      ```
      domain:
        spec:
-         image: oracle/weblogic-updated:3.1.0
+         image: oracle/weblogic-updated:3.1.1
      ```
 e. The operator will now initiate a rolling restart, which will apply the updated image, for all the servers in the domain.
 

diff --git a/docs-source/content/userguide/managing-operators/installation/_index.md b/docs-source/content/userguide/managing-operators/installation/_index.md
@@ -117,7 +117,7 @@ the `helm upgrade` command requires that you supply a new Helm chart and image.
 ```
 $ helm upgrade \
   --reuse-values \
-  --set image=oracle/weblogic-kubernetes-operator:3.1.0 \
+  --set image=oracle/weblogic-kubernetes-operator:3.1.1 \
   --namespace weblogic-operator-namespace \
   --wait \
   weblogic-operator \

diff --git a/docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md b/docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md
@@ -100,7 +100,7 @@ javaLoggingLevel:  "FINE"
 ##### `image`
 Specifies the Docker image containing the operator code.
 
-Defaults to `oracle/weblogic-kubernetes-operator:3.1.0`.
+Defaults to `oracle/weblogic-kubernetes-operator:3.1.1`.
 
 Example:
 ```

diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -1,134 +1,144 @@
 apiVersion: v1
 entries:
   weblogic-operator:
+  - apiVersion: v1
+    appVersion: 3.1.1
+    created: "2020-12-17T11:40:43.541434-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:04:35.436865-05:00"
+    created: "2020-12-17T11:40:43.54029-05:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: b6edb5cbb947d1d58159ce74daec59c46b5d38f3753be2389b7d3d7a277444f8
+    digest: acf600d0951dc3d8a0b05b35f3b9b1e62d827ef483fa863b0e37054ebb61f853
     name: weblogic-operator
     type: application
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.0.tgz
     version: 3.1.0
   - apiVersion: v1
-    created: "2020-11-24T15:04:35.432126-05:00"
+    created: "2020-12-17T11:40:43.537876-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:04:35.42969-05:00"
+    created: "2020-12-17T11:40:43.53578-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:04:35.42692-05:00"
+    created: "2020-12-17T11:40:43.528221-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:04:35.42484-05:00"
+    created: "2020-12-17T11:40:43.526999-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:04:35.42294-05:00"
+    created: "2020-12-17T11:40:43.5253-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:04:35.419443-05:00"
+    created: "2020-12-17T11:40:43.523413-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:04:35.417959-05:00"
+    created: "2020-12-17T11:40:43.522441-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:04:35.415317-05:00"
+    created: "2020-12-17T11:40:43.521221-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:04:35.413165-05:00"
+    created: "2020-12-17T11:40:43.520165-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:04:35.411141-05:00"
+    created: "2020-12-17T11:40:43.518976-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:04:35.373414-05:00"
+    created: "2020-12-17T11:40:43.513483-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:04:35.366089-05:00"
+    created: "2020-12-17T11:40:43.512156-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:04:35.364344-05:00"
+    created: "2020-12-17T11:40:43.51064-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:04:35.356977-05:00"
+    created: "2020-12-17T11:40:43.509172-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:04:35.355261-05:00"
+    created: "2020-12-17T11:40:43.507864-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:04:35.309043-05:00"
+generated: "2020-12-17T11:40:43.480949-05:00"
diff --git a/docs/charts/weblogic-operator-3.1.1.tgz b/docs/charts/weblogic-operator-3.1.1.tgz
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>oracle.kubernetes</groupId>
         <artifactId>operator-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>integration-tests</artifactId>

diff --git a/json-schema-maven-plugin/pom.xml b/json-schema-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>jsonschema-maven-plugin</artifactId>

diff --git a/json-schema/pom.xml b/json-schema/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>json-schema</artifactId>

diff --git a/kubernetes/charts/weblogic-operator/Chart.yaml b/kubernetes/charts/weblogic-operator/Chart.yaml
@@ -6,5 +6,5 @@ name: weblogic-operator
 description: Helm chart for configuring the WebLogic operator.
 
 type: application
-version: 3.1.0
-appVersion: 3.1.0
+version: 3.1.1
+appVersion: 3.1.1
diff --git a/kubernetes/charts/weblogic-operator/values.yaml b/kubernetes/charts/weblogic-operator/values.yaml
@@ -63,7 +63,7 @@ domainNamespaces:
 enableClusterRoleBinding: false
 
 # image specifies the Docker image containing the operator.
-image: "oracle/weblogic-kubernetes-operator:3.1.0"
+image: "oracle/weblogic-kubernetes-operator:3.1.1"
 
 # imagePullPolicy specifies the image pull policy for the operator's Docker image.
 imagePullPolicy: IfNotPresent

diff --git a/kubernetes/hands-on-lab/tutorials/install.operator.ocishell.md b/kubernetes/hands-on-lab/tutorials/install.operator.ocishell.md
@@ -65,7 +65,7 @@ Note the arguments and values:
 - The name of the Helm release.
 - The relative path to the Helm chart.
 - **namespace**: The namespace where the operator is to be deployed.
-- **image**: The prebuilt operator 3.1.0 image, available on the public Docker Hub.
+- **image**: The prebuilt operator 3.1.1 image, available on the public Docker Hub.
 - **serviceAccount**: The service account required to run the operator.
 - **enableClusterRoleBinding**: Grants the operator privileges in all cluster namespaces.
 - **domainNamespaceSelectionStrategy**: Chooses how the operator will select namespaces it manages.
@@ -78,7 +78,7 @@ Execute the following `helm install`:
 helm install sample-weblogic-operator \
   kubernetes/charts/weblogic-operator \
   --namespace sample-weblogic-operator-ns \
-  --set "image=oracle/weblogic-kubernetes-operator:3.1.0" \
+  --set "image=oracle/weblogic-kubernetes-operator:3.1.1" \
   --set "serviceAccount=sample-weblogic-operator-sa" \
   --set "enableClusterRoleBinding=true" \
   --set "domainNamespaceSelectionStrategy=LabelSelector" \

diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>oracle.kubernetes</groupId>
         <artifactId>operator-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>installation-tests</artifactId>

diff --git a/operator/pom.xml b/operator/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>oracle.kubernetes</groupId>
     <artifactId>operator-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
   </parent>
 
   <artifactId>weblogic-kubernetes-operator</artifactId>

diff --git a/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java b/operator/src/main/java/oracle/kubernetes/operator/steps/ManagedServerUpIteratorStep.java
@@ -94,10 +94,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);
   }
 
 
@@ -167,7 +168,7 @@ void add(StepAndPacket serverToStart) {
     public NextAction apply(Packet packet) {
 
       if (startDetailsQueue.isEmpty()) {
-        return doNext(new ManagedServerUpAfterStep(getNext()), packet);
+        return doNext(getNext(), packet);
       } else if (hasServerAvailableToStart(packet.getSpi(DomainPresenceInfo.class))) {
         numStarted.getAndIncrement();
         return doForkJoin(this, packet, Collections.singletonList(startDetailsQueue.poll()));
-Original file line number
+Diff line change
@@ Expand Up @@
          ```
          domain:
            spec:
-             image: oracle/weblogic-updated:3.1.0
+             image: oracle/weblogic-updated:3.1.1
          ```
     e. The operator will now initiate a rolling restart, which will apply the updated image, for all the servers in the domain.
@@ Expand Down @@