Merge branch 'develop' into wsapp

Author: marinakog

.gitignore

@@ -43,3 +43,4 @@ release.properties
 dependency-reduced-pom.xml
 *.ipr
 *.iws
+docs-source/docs

Dockerfile

@@ -9,7 +9,7 @@
 # Pull base image
 # From the Docker store
 # -------------------------
-FROM store/oracle/serverjre:8
+FROM openjdk:11-oracle
 RUN yum -y install openssl && yum clean all
 
 # Maintainer

README.md

@@ -21,8 +21,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.0.1.
-This release was published on March 4, 2019.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
+This release was published on TBD.
 ***
 
 # Documentation

buildtime-reports/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>2.1</version>
+        <version>2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

docs-source/config.toml

@@ -7,7 +7,9 @@ theme = "hugo-theme-learn"
 
 publishDir = "docs"
 
+# analytics
+googleAnalytics = "UA-129126578-2"
+
 # For search functionality
 [outputs]
 home = [ "HTML", "RSS", "JSON"]
-

docs-source/content/_index.md

@@ -17,7 +17,7 @@ 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]({{< relref "/quickstart/_index.md" >}}), or you can peruse our [documentation]({{< relref "/userguide/_index.md" >}}), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples]({{< relref "/samples/_index.md" >}}).
 
 ***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.1.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
 This release was published on TBD.
 ***
 

docs-source/content/recent-changes.md

@@ -10,6 +10,8 @@ This document tracks recent changes to the operator, especially ones that introd
 
 | Date | Version | Introduces backward incompatibilities | Change |
 | --- | --- | --- | --- |
+| TBD | v2.2 | no  | TBD  
+| April 4, 2019 | v2.1 | no  | Customers can add init and sidecar containers to generated pods.  
 | March 4, 2019 | v2.0.1 | no  | OpenShift support is now certified.  Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.  
 | January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.  
 | January 16, 2019 | v2.0-rc2 | yes | Schema updates are completed, and various bugs fixed.

docs-source/content/release-notes.md

@@ -8,7 +8,8 @@ draft: false
 
 | Date | Version | Introduces backward incompatibilities | Change |
 | --- | --- | --- | --- |
-| TBD | v2.1 | no  |  
+| TBD | v2.2 | no  | TBD 
+| April 4, 2019 | v2.1 | no  | Customers can add init and sidecar containers to generated pods.  
 | March 4, 2019 | v2.0.1 | no  | OpenShift support is now certified.  Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.  
 | January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.  
 | January 16, 2019 | v2.0-rc2 | yes | Schema updates are completed, and various bugs fixed.

docs-source/content/userguide/managing-domains/domain-lifecycle/scaling.md

@@ -255,15 +255,15 @@ details about [Using Prometheus to Automatically Scale WebLogic Clusters on Kube
 
 ### Helpful Tips
 #### Debugging scalingAction.sh
-The [`scalingAction.sh`](/src/scripts/scaling/scalingAction.sh) script was designed to be executed within the
+The [`scalingAction.sh`](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/src/scripts/scaling/scalingAction.sh) script was designed to be executed within the
 Administration Server pod because the associated diagnostic module is targed to the Administration Server.
 
 The easiest way to verify and debug the `scalingAction.sh` script is to open a shell on the running Administration Server pod and execute the script on the command line.
 
 The following example illustrates how to open a bash shell on a running Administration Server pod named `domain1-admin-server` and execute the `scriptAction.sh` script.  It assumes that:
 
 * The domain home is in `/u01/oracle/user-projects/domains/domain1` (that is, the domain home is inside a Docker image).
-* The Dockerfile copied [`scalingAction.sh`](/src/scripts/scaling/scalingAction.sh) to `/u01/oracle/user-projects/domains/domain1/bin/scripts/scalingAction.sh`.
+* The Dockerfile copied [`scalingAction.sh`](https://github.com/oracle/weblogic-kubernetes-operator/blob/master/src/scripts/scaling/scalingAction.sh) to `/u01/oracle/user-projects/domains/domain1/bin/scripts/scalingAction.sh`.
 
 ```
 > kubectl exec -it domain1-admin-server /bin/bash

docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md

@@ -101,7 +101,7 @@ javaLoggingLevel:  "FINE"
 
 Specifies the Docker image containing the operator code.
 
-Defaults to `weblogic-kubernetes-operator:2.1`.
+Defaults to `weblogic-kubernetes-operator:2.2`.
 
 Example:
 ```