oracle
diff --git a/‎Dockerfile
Lines changed: 9 additions & 9 deletions b/‎Dockerfile
Lines changed: 9 additions & 9 deletions
diff --git a/‎LICENSE.txt
Lines changed: 1 addition & 1 deletion b/‎LICENSE.txt
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md
Lines changed: 2 additions & 2 deletions b/‎README.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎build-tools/checkstyle/customized_google_checks.xml
Lines changed: 1 addition & 1 deletion b/‎build-tools/checkstyle/customized_google_checks.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎build/kube.config
Lines changed: 0 additions & 19 deletions b/‎build/kube.config
Lines changed: 0 additions & 19 deletions
diff --git a/‎buildDockerImage.sh
Lines changed: 1 addition & 1 deletion b/‎buildDockerImage.sh
Lines changed: 1 addition & 1 deletion
diff --git a/‎buildtime-reports/pom.xml
Lines changed: 1 addition & 1 deletion b/‎buildtime-reports/pom.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎deploy.sh
Lines changed: 0 additions & 11 deletions b/‎deploy.sh
Lines changed: 0 additions & 11 deletions
diff --git a/‎docs-source/content/_index.md
Lines changed: 6 additions & 31 deletions b/‎docs-source/content/_index.md
Lines changed: 6 additions & 31 deletions
diff --git a/‎docs-source/content/developerguide/backwards-compatibility.md
Lines changed: 1 addition & 1 deletion b/‎docs-source/content/developerguide/backwards-compatibility.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs-source/content/developerguide/code-structure.md
Lines changed: 6 additions & 5 deletions b/‎docs-source/content/developerguide/code-structure.md
Lines changed: 6 additions & 5 deletions
diff --git a/‎docs-source/content/developerguide/domain-processing.md
Lines changed: 3 additions & 3 deletions b/‎docs-source/content/developerguide/domain-processing.md
Lines changed: 3 additions & 3 deletions
diff --git a/‎docs-source/content/faq/_index.md
Lines changed: 8 additions & 12 deletions b/‎docs-source/content/faq/_index.md
Lines changed: 8 additions & 12 deletions
diff --git a/‎docs-source/content/faq/boot-identity-not-valid.md
Lines changed: 2 additions & 1 deletion b/‎docs-source/content/faq/boot-identity-not-valid.md
Lines changed: 2 additions & 1 deletion
diff --git a/‎docs-source/content/faq/cannot-pull-image.md
Lines changed: 30 additions & 8 deletions b/‎docs-source/content/faq/cannot-pull-image.md
Lines changed: 30 additions & 8 deletions
diff --git a/‎docs-source/content/faq/coherence-requirements.md
Lines changed: 5 additions & 2 deletions b/‎docs-source/content/faq/coherence-requirements.md
Lines changed: 5 additions & 2 deletions
diff --git a/‎docs-source/content/faq/configmaps.md
Lines changed: 3 additions & 2 deletions b/‎docs-source/content/faq/configmaps.md
Lines changed: 3 additions & 2 deletions
diff --git a/‎docs-source/content/faq/domain-secret-mismatch.md
Lines changed: 3 additions & 2 deletions b/‎docs-source/content/faq/domain-secret-mismatch.md
Lines changed: 3 additions & 2 deletions
@@ -20,23 +20,23 @@ RUN set -eux; \
 # Default to UTF-8 file.encoding
 ENV LANG en_US.UTF-8
 
-ENV JAVA_HOME /usr/local/graalvm-ce-java11
+ENV JAVA_HOME /usr/local/java
 ENV PATH /operator:$JAVA_HOME/bin:$PATH
 
-ENV JAVA_VERSION 11.0.7
-ENV JAVA_URL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.2/graalvm-ce-java11-linux-amd64-19.3.2.tar.gz
+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
 
 # Install Java and make the operator run with a non-root user id (1000 is the `oracle` user)
 RUN set -eux; \
-    curl -fL -o /graalvm-ce-java11.tar.gz "$JAVA_URL"; \
+    curl -fL -o /jdk.tar.gz "$JAVA_URL"; \
     mkdir -p "$JAVA_HOME"; \
-    tar --extract --file /graalvm-ce-java11.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
-    rm /graalvm-ce-java11.tar.gz; \
+    tar --extract --file /jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
+    rm /jdk.tar.gz; \
     mkdir /usr/java; \
     ln -sfT "$JAVA_HOME" /usr/java/default; \
     ln -sfT "$JAVA_HOME" /usr/java/latest; \
-    rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods" "$JAVA_HOME/languages" "$JAVA_HOME/tools" "$JAVA_HOME/lib/svm" "$JAVA_HOME/lib/installer" "$JAVA_HOME/lib/visualvm" "$JAVA_HOME/lib/truffle" "$JAVA_HOME/lib/polyglot"; \
-    rm -f "$JAVA_HOME/lib/src.zip" "$JAVA_HOME/lib/libjvmcicompiler.so" "$JAVA_HOME/bin/polyglot"; \
+    rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods"; \
+    rm -f "$JAVA_HOME/lib/src.zip"; \
     for bin in "$JAVA_HOME/bin/"*; do \
         base="$(basename "$bin")"; \
         [ ! -e "/usr/bin/$base" ]; \
@@ -60,4 +60,4 @@ HEALTHCHECK --interval=1m --timeout=10s \
 
 WORKDIR /operator/
 
-CMD ["/operator/operator.sh"]
+CMD ["/operator/operator.sh"]
@@ -1,4 +1,4 @@
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 
 
@@ -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 2.6.0.
-This release was published on June 22, 2020.
+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.
 ***
 
 # Documentation
 
@@ -302,7 +302,7 @@
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowedAnnotations" value="Override, Test, Before, After"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
         </module>
         <module name="MethodName">
 
@@ -33,7 +33,7 @@ while getopts "t:" optname; do
   esac
 done
 
-IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:2.6.0}
+IMAGE_NAME=${name:-oracle/weblogic-kubernetes-operator:3.0.0}
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
 # Proxy settings
 
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>2.6.0</version>
+        <version>3.0.0</version>
     </parent>
 
     <artifactId>buildtime-reports</artifactId>
 
@@ -23,37 +23,12 @@ using the operator to deploy and run a WebLogic domain container-packaged web ap
 ***
 #### Current production release
 
-The [current production release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.6.0.
-This release was published on June 22, 2020. See the operator prerequisites and supported environments [here]({{< relref "/userguide/introduction/introduction#operator-prerequisites" >}}).
-
-#### Preview of next major release
-
-The [current preview release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 3.0.0-rc1 (release candidate).
-This release candidate is suitable for use by early adopters who wish to test 3.0.0 features and provide feedback.
-This release candidate was published on May 8, 2020.  There may be additional release candidates before the final 3.0.0 release.
-
-This release candidate introduces _non-backward compatible_ changes.  This release candidate cannot be run in the same
-cluster as another release of the operator.  You can upgrade from 2.6.0 to 3.0.0-rc1 without needing to restart or recreate
-any existing domains. However, please note that we _do_ plan to support running the final 3.0.0
-release in the same cluster with at least one 2.x release of the operator to allow for staged migration.
-
-The feature changes in 3.0.0-rc1 are:
-
-* Introduction of a new ["Model In Image"]({{% relref "/userguide/managing-domains/model-in-image" %}}) feature which allows you to have a domain
-  created at pod startup time from a WebLogic Deploy Tool model and archive.
-  This supports user-requested use cases like creating multiple domains from
-  the same model and automated updating of the domain based on model changes.
-  The operator automates management of the domain encryption keys to ensure
-  that they are not changed during domain updates.
-  We provide a [sample]({{% relref "/samples/simple/domains/model-in-image" %}}) that
-  demonstrates the key use cases for this feature.
-* Support for running the operator on Kubernetes 1.16.
-* Deprecation and removal of support for running the operator on Kubernetes 1.13
-  and earlier versions.
-* Deprecation and removal of support for Helm 2.x.  Helm 2.x uses the "tiller" pod
-  which needs to run with elevated privileges (`cluster-admin` or very close to that)
-  and which could be a vector for a privilege escalation attack.  Helm 3.x removes
-  Tiller and does not create the same exposure.
+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" >}}).
+
+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
+started by the 2.6.0 operator. See the operator upgrade guide [here]({{< relref "/userguide/managing-operators/installation/_index.md#upgrade-the-operator" >}}).
 
 ***
 
 
@@ -5,4 +5,4 @@ draft: false
 weight: 9
 ---
 
-Starting with the 2.0.1 release, operator releases must be backward compatible with respect to the domain resource schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface.  We will maintain compatibility for three releases, except in the case of a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.
+Starting with the 2.0.1 release, operator releases must be backward compatible with respect to the Domain schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface.  We will maintain compatibility for three releases, except in the case of a clearly communicated deprecated feature, which will be maintained for one release after a replacement is available.
@@ -7,17 +7,18 @@ weight: 6
 
 This project has the following directory structure:
 
-* `docs`: Generated Javadoc and Swagger
-* `integration-tests`: Integration test suite
+* `docs`: Helm charts, Javadoc, Operator REST API Swagger, and Domain reference
+* `docs-source`: This documentation
+* `integration-tests`: Original, JUnit 4 integration test suite (see also `new-integration-tests`)
 * `json-schema`: Java model to JSON schema generator
 * `json-schema-maven-plugin`: Maven plugin for schema generator
 * `kubernetes/charts`: Helm charts
 * `kubernetes/samples`: All samples, including for WebLogic domain creation
-* `model`: Domain resource Java model
+* `new-integration-tests`: JUnit 5 integration test suite (see also `integration-tests`)
 * `operator`: Operator runtime
-* `site`: This documentation
+* `site`: Historical documentation
 * `src/scripts`: Scripts operator injects into WebLogic Server instance Pods
-* `swagger`: Swagger files for the Kubernetes API server and domain resource
+* `swagger`: Swagger files for the Kubernetes API server and Domain type
 
 ### Watch package
 
 
@@ -6,10 +6,10 @@ weight: 8
 ---
 
 
-When the operator starts, it lists all existing Domain resources and processes these domains to create the necessary Kubernetes resources, such as Pods and Services, if they don't already exist.  This initialization also includes looking for any stranded resources that, while created by the operator, no longer correlate with a Domain resource.
+When the operator starts, it lists all the existing Domains and then processes these Domains to create the necessary Kubernetes resources, such as Pods and Services, if they don't already exist. This initialization also includes looking for any stranded resources that, while created by the operator, no longer correlate with a Domain.
 
-After this, the operator starts watches for changes to Domain resources and any changes to other resources created by the operator.  When a watch event is received, the operator processes the modified Domain resource to again bring the runtime presence in to alignment with the desired state.
+After this, the operator starts watches for changes to Domains and any changes to other resources created by the operator.  When a watch event is received, the operator processes the modified Domain to again bring the runtime presence into alignment with the desired state.
 
-The operator ensures that at most one `Fiber` is running for any given Domain.  For instance, if the customer modifies a Domain resource to trigger a rolling restart, then the operator will create a `Fiber` to process this activity.  However, if while the rolling restart is in process, the customer makes another change to the Domain resource, such as to increase the `replicas` field for a cluster, then the operator will cancel the in-flight `Fiber` and replace it with a new `Fiber`.  This replacement processing must be able to handle taking over for the cancelled work regardless of where the earlier processing may have been in its flow.  Therefore, domain processing always starts at the beginning of the "make right" flow without any state other than the current Domain resource.
+The operator ensures that at most one `Fiber` is running for any given Domain.  For instance, if the customer modifies a Domain to initiate a rolling restart, then the operator will create a `Fiber` to process this activity.  However, if while the rolling restart is in process, the customer makes another change to the Domain, such as to increase the `replicas` field for a cluster, then the operator will cancel the in-flight `Fiber` and replace it with a new `Fiber`.  This replacement processing must be able to handle taking over for the cancelled work regardless of where the earlier processing may have been in its flow.  Therefore, domain processing always starts at the beginning of the "make right" flow without any state other than the current Domain resource.
 
 Finally, the operator periodically lists all Domains and rechecks them.  This is a backstop against the possibility that a watch event is missed, such as because of a temporary network outage.  Recheck activities will not interrupt already running processes for a given Domain.
@@ -1,14 +1,10 @@
-+++
-title = "Frequently asked questions"
-date = 2019-02-23T08:14:59-05:00
-weight = 7
-chapter = true
-draft = false
-pre = "<b>7. </b>"
-+++
-
-### Chapter 7
-
-# Frequently Asked Questions
+---
+title: "Frequently asked questions"
+date: 2019-02-23T08:14:59-05:00
+weight: 7
+draft: false
+---
 
 This section provides answers to frequently asked questions.
+
+{{% children style="h4" description="true" %}}
@@ -2,7 +2,8 @@
 title: "Boot identity not valid"
 date: 2020-03-02T08:08:19-04:01
 draft: false
-weight: 20
+weight: 3
+description: "One or more WebLogic Server instances in my domain will not start and I see errors in the server log like this: Boot identity not valid."
 ---
 
 > One or more WebLogic Server instances in my domain will not start and I see errors in the server log like this:
 
@@ -2,15 +2,16 @@
 title: "Cannot pull image"
 date: 2019-03-23T08:08:19-04:00
 draft: false
-weight: 10
+weight: 2
+description: "My domain will not start and I see errors like `ImagePullBackoff` or `Cannot pull image`."
 ---
 
 > My domain will not start and I see errors like `ImagePullBackoff` or `Cannot pull image`
 
 When you see these kinds of errors, it means that Kubernetes cannot find your Docker image.
 The most common causes are:
 
-* The `image` value in your domain resource is set incorrectly, meaning Kubernetes will be
+* The `image` value in your Domain is set incorrectly, meaning Kubernetes will be
   trying to pull the wrong image.
 * The image requires authentication or permission in order to pull it and you have not
   configured Kubernetes with the necessary credentials, for example in an `imagePullSecret`.
@@ -91,17 +92,16 @@ Here is an example of part of a domain custom resource file with the `imagePullS
 specified:
 
 ```
-apiVersion: "weblogic.oracle/v7"
+apiVersion: "weblogic.oracle/v8"
 kind: Domain
 metadata:
   name: domain1
   namespace: default
   labels:
-    weblogic.resourceVersion: domain-v2
     weblogic.domainUID: domain1
 spec:
   domainHome: /u01/oracle/user_projects/domains/domain1
-  domainHomeInImage: true
+  domainHomeSourceType: Image
   image: "some.registry.com/owner/domain1:1.0"
   imagePullPolicy: "IfNotPresent"
   imagePullSecrets:
@@ -122,15 +122,37 @@ kubectl patch serviceaccount default \
 ```
 
 {{% notice note %}}
-You can provide mutliple `imagePullSecrets` if you need to pull Docker images from multiple
+You can provide multiple `imagePullSecrets` if you need to pull Docker images from multiple
 remote Docker registries or if your images require different authentication credentials.
 For more information, see [Docker Image Protection]({{<relref "/security/domain-security/image-protection#weblogic-domain-in-docker-image-protection">}}).
 {{% /notice %}}
 
+#### Pushing the image to a repository
+
+If you have an image in your local repository that you would like to copy to
+a remote repository, then the Docker steps are:
+
+- Use [docker login](https://docs.docker.com/engine/reference/commandline/login/)
+  to log in to the target repository's registry. For example:
+  ```
+  docker login some.registry.com -u username -p password
+  ```
+- Use [docker tag](https://docs.docker.com/engine/reference/commandline/tag/)
+  to mark the image with the target registry, owner, repository name, and tag.
+  For example:
+  ```
+  docker tag domain1:1.0 some.registry.com/owner/domain1:1.0
+  ```
+- Use [docker push](https://docs.docker.com/engine/reference/commandline/push/)
+  to push the image to the repository. For example:
+  ```
+  docker push some.registry.com/owner/domain1:1.0
+  ```
+
 #### Manually copying the image to your worker nodes
 
 If you are not able to use a remote Docker registry, for example if your Kubernetes cluster is
-in a secure network with no external access, you can manually copy the Docker images to the
+in a secure network with no external access, then you can manually copy the Docker images to the
 cluster instead.
 
 On the machine where you created the image, export it into a TAR file using this command:
@@ -150,4 +172,4 @@ docker load < domain1.tar
 
 After you have ensured that the images are accessible on all worker nodes, you may need to restart
 the pods so that Kubernetes will attempt to pull the images again.   You can do this by
-deleting the pods themselves, or deleting the domain resource and then recreating it.
+deleting the pods themselves, or deleting the Domain and then recreating it.
@@ -1,8 +1,11 @@
 ---
-title: "Coherence Requirements"
+title: "Coherence requirements"
 date: 2019-08-12T12:41:38-04:00
 draft: false
-weight: 90
+weight: 12
+description: "If you are running Coherence on Kubernetes, either inside a WebLogic domain
+or standalone, then there are some additional requirements to make sure
+that Coherence can form clusters."
 ---
 
 If you are running Coherence on Kubernetes, either inside a WebLogic domain
 
@@ -2,7 +2,8 @@
 title: "Providing access to a ConfigMap"
 date: 2020-01-07T15:02:28-05:00
 draft: false
-weight: 70
+weight: 10
+description: "I need to provide an instance with access to a ConfigMap."
 ---
 > I need to provide an instance with access to a ConfigMap.
 
@@ -15,7 +16,7 @@ In each case, the access is configured within the `serverPod` element of the des
 For example, given
 a ConfigMap named `my-map` with entries `key-1` and `key-2`, you can provide access to both values as separate files
 in the same directory within the `cluster-1` cluster with the following
-in your [domain resource](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md):
+in your [Domain](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md):
 
 
 ```
 
@@ -2,10 +2,11 @@
 title: "Domain secret mismatch"
 date: 2020-03-02T08:08:19-04:00
 draft: false
-weight: 21
+weight: 4
+description: "One or more WebLogic Server instances in my domain will not start and the domain resource `status` or the pod log reports errors like this: Domain secret mismatch."
 ---
 
-> One or more WebLogic Server instances in my domain will not start and the domain resource `status` or the pod log reports errors like this:
+> One or more WebLogic Server instances in my domain will not start and the Domain `status` or the pod log reports errors like this:
 >
 > ***Domain secret mismatch. The domain secret in `DOMAIN_HOME/security/SerializedSystemIni.dat` where DOMAIN_HOME=`$DOMAIN_HOME` does not match the domain secret found by the introspector job. WebLogic requires that all WebLogic Servers in the same domain share the same domain secret.***
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.`
	`1`	`+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.`
`2`	`2`
`3`	`3`	`The Universal Permissive License (UPL), Version 1.0`
`4`	`4`