Operator version 3.0.1 (#1864)

rjeberhard · lennyphan · web-flow · commit 1876ada90276 · 2020-08-13T10:53:26.000-04:00
* Prepare for 3.0.1 release

* Ignore i and k

* Reading comprehension

* Correct JDK URL

* lookup and save internalOperatorkey, if already exists

* Update kindtest.sh

* Review comment

Co-authored-by: Lenny Phan &lt;lenny.phan@oracle.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ ENV JAVA_HOME /usr/local/java
 ENV PATH /operator:$JAVA_HOME/bin:$PATH
 
 ENV JAVA_VERSION 14.0.2
-ENV JAVA_URL https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/11/GPL/openjdk-14.0.2_linux-x64_bin.tar.gz
+ENV JAVA_URL https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL/openjdk-14.0.2_linux-x64_bin.tar.gz
 
 # Install Java and make the operator run with a non-root user id (1000 is the `oracle` user)
 RUN set -eux; \
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.0.0.
-This release was published on July 17, 2020.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.0.1.
+This release was published on August 13, 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.0.0}
+IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:3.0.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.0.0</version>
+        <version>3.0.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.0.0.
-This release was published on July 17, 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.0.1.
+This release was published on August 13, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
 
 This release introduces _non-backward compatible_ changes; however, operators using this release can be run in the same
 Kubernetes cluster as operators using the 2.6.0 version allowing for staged migration. You can replace a 2.6.0 operator with a 3.x operator without needing to recreate any existing domains; however, you must delete the 2.6.0 Helm release and then install the 3.x version rather than using a Helm upgrade. When the 3.x operator starts, it will roll any running WebLogic Server instances
diff --git a/docs-source/content/faq/namespace-management.md b/docs-source/content/faq/namespace-management.md
@@ -40,7 +40,7 @@ elkIntegrationEnabled: false
 externalDebugHttpPort: 30999
 externalRestEnabled: false
 externalRestHttpsPort: 31001
-image: oracle/weblogic-kubernetes-operator:3.0.0
+image: oracle/weblogic-kubernetes-operator:3.0.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.0.0
+    $ docker pull oracle/weblogic-kubernetes-operator:3.0.1
     ```
 
 1. Pull the Traefik load balancer image:
diff --git a/docs-source/content/quickstart/install.md b/docs-source/content/quickstart/install.md
@@ -71,7 +71,7 @@ $ helm install traefik-operator stable/traefik \
     ```bash
     $ helm install sample-weblogic-operator kubernetes/charts/weblogic-operator \
       --namespace sample-weblogic-operator-ns \
-      --set image=oracle/weblogic-kubernetes-operator:3.0.0 \
+      --set image=oracle/weblogic-kubernetes-operator:3.0.1 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "domainNamespaces={}" \
       --wait
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 |
 | --- | --- | --- | --- |
+| August 13, 2020 | v3.0.1 | no | Fixed an issue preventing the REST interface from working after a Helm upgrade. Helm 3.1.3+ now required. |
 | July 17, 2020 | v3.0.0 | yes | Adds Model in Image feature and support for applying topology and configuration override changes without downtime. Removal of support for Helm 2.x. Operator performance improvements to manage many domains in the same Kubernetes cluster. |
 | June 22, 2020 | v2.6.0 | no | Kubernetes 1.16, 1.17, and 1.18 support. Removal of support for Kubernetes 1.13 and earlier. This release can be run in the same cluster with operators of either 2.5.0 and below, or with 3.x providing an upgrade path. Certified support of Oracle Linux Cloud Native Environment (OLCNE) 1.1 with Kubernetes 1.17.0.
 | February 26, 2020 | v2.5.0 | no | Support for Helm 3.x and OpenShift 4.3.  Operator can be installed in a namespace-dedicated mode where operator requires no cluster-level Kubernetes privileges. This version is not supported on Kubernetes 1.16+; check the [prerequisites]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
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.0.0
+$ docker pull oracle/weblogic-kubernetes-operator:3.0.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,12 +16,12 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
 
 ### Operator prerequisites
 
-For the current production release 3.0.0:
+For the current production release 3.0.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`) *or* OpenShift SDN on OpenShift 4.3 systems.
 * Docker 18.9.1 or 19.03.1 (check with `docker version`) *or* CRI-O 1.14.7 (check with `crictl version | grep RuntimeVersion`).
-* Helm 3.0.3+ (check with `helm version --client --short`).
+* Helm 3.1.3+ (check with `helm version --client --short`).
 * Either Oracle WebLogic Server 12.2.1.3.0 with patch 29135930, Oracle WebLogic Server 12.2.1.4.0, or Oracle WebLogic Server 14.1.1.0.0.
    * The existing WebLogic Docker image, `container-registry.oracle.com/middleware/weblogic:12.2.1.3 `,
    has all the necessary patches applied.
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.0.0
+         image: oracle/weblogic-updated:3.0.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
@@ -95,7 +95,7 @@ a 2.6.0 operator to a 3.x operator. Instead, you must delete the 2.6.0 operator
 The deletion of the 2.6.0 operator will _not affect_ the Domain CustomResourceDefinition (CRD) and will _not stop_ any
 WebLogic Server instances already running.
 
-When the 3.0.0 operator is installed, it will automatically roll any running WebLogic Server instances created by the 2.6.0 operator.
+When the 3.x operator is installed, it will automatically roll any running WebLogic Server instances created by the 2.6.0 operator.
 This rolling restart will preserve WebLogic cluster availability guarantees (for clustered members only) similarly to any other rolling restart.
 
 To delete the 2.6.0 operator:
@@ -104,7 +104,7 @@ To delete the 2.6.0 operator:
 $ helm delete weblogic-operator -n weblogic-operator-namespace
 ```
 
-Then install the 3.0.0 operator using the [installation](#install-the-operator-helm-chart) instructions above.
+Then install the 3.x operator using the [installation](#install-the-operator-helm-chart) instructions above.
 
 The following instructions will be applicable to upgrade operators within the 3.x release family
 as additional versions are released.
@@ -115,7 +115,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.0.0 \
+  --set image=oracle/weblogic-kubernetes-operator:3.0.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
@@ -129,7 +129,7 @@ javaLoggingLevel:  "FINE"
 
 Specifies the Docker image containing the operator code.
 
-Defaults to `weblogic-kubernetes-operator:3.0.0`.
+Defaults to `weblogic-kubernetes-operator:3.0.1`.
 
 Example:
 ```
diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -2,91 +2,99 @@ apiVersion: v1
 entries:
   weblogic-operator:
   - apiVersion: v1
-    created: "2020-07-16T17:52:31.587801-04:00"
+    created: "2020-08-11T15:14:12.218809-04: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-08-11T15:14:12.215675-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 303288a48a6075d52538bb4e17dd46f8b1431158ee81bc878d9f1f264d30192e
     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-07-16T17:52:31.584263-04:00"
+    created: "2020-08-11T15:14:12.214502-04: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-07-16T17:52:31.582236-04:00"
+    created: "2020-08-11T15:14:12.212883-04: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-07-16T17:52:31.580289-04:00"
+    created: "2020-08-11T15:14:12.21132-04: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-07-16T17:52:31.575884-04:00"
+    created: "2020-08-11T15:14:12.210065-04: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-07-16T17:52:31.574384-04:00"
+    created: "2020-08-11T15:14:12.203115-04: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-07-16T17:52:31.571867-04:00"
+    created: "2020-08-11T15:14:12.191067-04: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-07-16T17:52:31.570651-04:00"
+    created: "2020-08-11T15:14:12.189715-04: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-07-16T17:52:31.569366-04:00"
+    created: "2020-08-11T15:14:12.188569-04: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-07-16T17:52:31.567722-04:00"
+    created: "2020-08-11T15:14:12.18727-04: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-07-16T17:52:31.5634-04:00"
+    created: "2020-08-11T15:14:12.185637-04: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-07-16T17:52:31.553485-04:00"
+generated: "2020-08-11T15:14:12.184184-04:00"
diff --git a/docs/charts/weblogic-operator-3.0.1.tgz b/docs/charts/weblogic-operator-3.0.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.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>operator-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.0.0</version>
+        <version>3.0.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.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>json-schema</artifactId>
diff --git a/kindtest.sh b/kindtest.sh
@@ -51,6 +51,8 @@ function usage {
   echo "      (default: false) "
   echo "  -x Number of threads to run the classes in parallel"
   echo "      (default: 2) "
+  echo "  -d Reserved for future use"
+  echo "  -i Reserved for future use"
   echo "  -h Help"
   exit $1
 }
@@ -67,7 +69,7 @@ cni_implementation="kindnet"
 parallel_run="false"
 threads="2"
 
-while getopts ":h:n:o:t:v:c:x:p:" opt; do
+while getopts ":h:n:o:t:v:c:x:p:d:i:" opt; do
   case $opt in
     v) k8s_version="${OPTARG}"
     ;;
@@ -85,6 +87,10 @@ while getopts ":h:n:o:t:v:c:x:p:" opt; do
     ;;
     h) usage 0
     ;;
+    d) echo "Ignoring -d=${OPTARG}"
+    ;;
+    i) echo "Ignoring -i=${OPTARG}"
+    ;;
     *) usage 1
     ;;
   esac
diff --git a/kubernetes/charts/weblogic-operator/Chart.yaml b/kubernetes/charts/weblogic-operator/Chart.yaml
@@ -3,5 +3,5 @@
 
 name: weblogic-operator
 apiVersion: v1
-version: 3.0.0
+version: 3.0.1
 description: Helm chart for configuring the WebLogic operator.
diff --git a/kubernetes/charts/weblogic-operator/templates/_operator-secret.tpl b/kubernetes/charts/weblogic-operator/templates/_operator-secret.tpl
@@ -9,6 +9,13 @@ data:
   {{- if (and .externalRestEnabled (hasKey . "externalOperatorKey")) }}
   externalOperatorKey: {{ .externalOperatorKey | quote }}
   {{- end }}
+  {{- $secret := (lookup "v1" "Secret" .Release.Namespace "weblogic-operator-secrets") }}
+  {{- if $secret }}
+  {{- $internalOperatorKey := index $secret.data "internalOperatorKey" }}
+  {{- if $internalOperatorKey }}
+  internalOperatorKey: {{ $internalOperatorKey }}
+  {{- end }}
+  {{- end }}
 metadata:
   labels:
     weblogic.operatorName: {{ .Release.Namespace | quote }}
diff --git a/kubernetes/charts/weblogic-operator/values.yaml b/kubernetes/charts/weblogic-operator/values.yaml
@@ -25,7 +25,7 @@ domainNamespaces:
   - "default"
 
 # image specifies the docker image containing the operator code.
-image: "oracle/weblogic-kubernetes-operator:3.0.0"
+image: "oracle/weblogic-kubernetes-operator:3.0.1"
 
 # imagePullPolicy specifies the image pull policy for the operator docker image.
 imagePullPolicy: "IfNotPresent"
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.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>installation-tests</artifactId>
diff --git a/new-integration-tests/pom.xml b/new-integration-tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>oracle.kubernetes</groupId>
         <artifactId>operator-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>new-integration-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.0.0</version>
+    <version>3.0.1</version>
   </parent>
 
   <artifactId>weblogic-kubernetes-operator</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>oracle.kubernetes</groupId>
   <artifactId>operator-parent</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 
   <modules>
     <module>operator</module>
diff --git a/swagger/pom.xml b/swagger/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>oracle.kubernetes</groupId>
         <artifactId>operator-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
 
     <artifactId>operator-swagger</artifactId>
