Prepare for next development cycle

rjeberhard · rjeberhard · commit 7b2b87d236bf · 2021-03-31T16:10:54.000-04:00
diff --git a/buildDockerImage.sh b/buildDockerImage.sh
@@ -33,7 +33,7 @@ while getopts "t:" optname; do
   esac
 done
 
-IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:3.2.0}
+IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:3.3.0}
 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.2.0</version>
+        <version>3.3.0</version>
     </parent>
 
     <artifactId>buildtime-reports</artifactId>
diff --git a/documentation/3.2/content/quickstart/prerequisites.md b/documentation/3.2/content/quickstart/prerequisites.md
@@ -12,5 +12,5 @@ The operator uses Helm to create and deploy the necessary resources and then run
 You should clone this repository to your local machine so that you have access to the
 various sample files mentioned throughout this guide:
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator
 ```
diff --git a/documentation/3.2/content/samples/simple/azure-kubernetes-service/domain-on-pv.md b/documentation/3.2/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
@@ -29,7 +29,7 @@ This sample demonstrates how to use the [Oracle WebLogic Server Kubernetes Opera
 Clone the [Oracle WebLogic Server Kubernetes Operator repository](https://github.com/oracle/weblogic-kubernetes-operator) to your machine. We will use several scripts in this repository to create a WebLogic domain. This sample was tested with v3.1.1, but should work with the latest release.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 
 {{% notice info %}} The following sections of the sample instructions will guide you, step-by-step, through the process of setting up a WebLogic cluster on AKS - remaining as close as possible to a native Kubernetes experience. This lets you understand and customize each step. If you wish to have a more automated experience that abstracts some lower level details, you can skip to the [Automation](#automation) section.
diff --git a/documentation/3.2/content/samples/simple/azure-kubernetes-service/model-in-image.md b/documentation/3.2/content/samples/simple/azure-kubernetes-service/model-in-image.md
@@ -30,7 +30,7 @@ This sample demonstrates how to use the [Oracle WebLogic Server Kubernetes Opera
 Clone the [Oracle WebLogic Server Kubernetes Operator repository](https://github.com/oracle/weblogic-kubernetes-operator) to your machine. We will use several scripts in this repository to create a WebLogic domain. This sample was tested with v3.1.1, but should work with the latest release.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 ```shell
 $ cd weblogic-kubernetes-operator
diff --git a/documentation/3.2/content/samples/simple/domains/model-in-image/prerequisites.md b/documentation/3.2/content/samples/simple/domains/model-in-image/prerequisites.md
@@ -23,7 +23,7 @@ weight: 1
    $ cd /tmp
    ```
    ```shell
-   $ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+   $ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
    ```
 
    > **Note**: We will refer to the top directory of the operator source tree as `/tmp/weblogic-kubernetes-operator`; however, you can use a different location.
diff --git a/documentation/3.2/content/samples/simple/tanzu-kubernetes-service/_index.md b/documentation/3.2/content/samples/simple/tanzu-kubernetes-service/_index.md
@@ -63,15 +63,11 @@ Kubernetes Operators use [Helm](https://helm.sh/) to manage Kubernetes applicati
 Clone the repository.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 ```shell
 $ cd weblogic-kubernetes-operator
 ```
-```shell
-$ git checkout v3.1.0
-```
-
 Grant the Helm service account the cluster-admin role.
 
 ```shell
diff --git a/documentation/staging/content/quickstart/prerequisites.md b/documentation/staging/content/quickstart/prerequisites.md
@@ -12,5 +12,5 @@ The operator uses Helm to create and deploy the necessary resources and then run
 You should clone this repository to your local machine so that you have access to the
 various sample files mentioned throughout this guide:
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator
 ```
diff --git a/documentation/staging/content/samples/simple/azure-kubernetes-service/domain-on-pv.md b/documentation/staging/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
@@ -29,7 +29,7 @@ This sample demonstrates how to use the [Oracle WebLogic Server Kubernetes Opera
 Clone the [Oracle WebLogic Server Kubernetes Operator repository](https://github.com/oracle/weblogic-kubernetes-operator) to your machine. We will use several scripts in this repository to create a WebLogic domain. This sample was tested with v3.1.1, but should work with the latest release.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 
 {{% notice info %}} The following sections of the sample instructions will guide you, step-by-step, through the process of setting up a WebLogic cluster on AKS - remaining as close as possible to a native Kubernetes experience. This lets you understand and customize each step. If you wish to have a more automated experience that abstracts some lower level details, you can skip to the [Automation](#automation) section.
diff --git a/documentation/staging/content/samples/simple/azure-kubernetes-service/model-in-image.md b/documentation/staging/content/samples/simple/azure-kubernetes-service/model-in-image.md
@@ -30,7 +30,7 @@ This sample demonstrates how to use the [Oracle WebLogic Server Kubernetes Opera
 Clone the [Oracle WebLogic Server Kubernetes Operator repository](https://github.com/oracle/weblogic-kubernetes-operator) to your machine. We will use several scripts in this repository to create a WebLogic domain. This sample was tested with v3.1.1, but should work with the latest release.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 ```shell
 $ cd weblogic-kubernetes-operator
diff --git a/documentation/staging/content/samples/simple/domains/model-in-image/prerequisites.md b/documentation/staging/content/samples/simple/domains/model-in-image/prerequisites.md
@@ -23,7 +23,7 @@ weight: 1
    $ cd /tmp
    ```
    ```shell
-   $ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+   $ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
    ```
 
    > **Note**: We will refer to the top directory of the operator source tree as `/tmp/weblogic-kubernetes-operator`; however, you can use a different location.
diff --git a/documentation/staging/content/samples/simple/tanzu-kubernetes-service/_index.md b/documentation/staging/content/samples/simple/tanzu-kubernetes-service/_index.md
@@ -63,15 +63,11 @@ Kubernetes Operators use [Helm](https://helm.sh/) to manage Kubernetes applicati
 Clone the repository.
 
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 ```shell
 $ cd weblogic-kubernetes-operator
 ```
-```shell
-$ git checkout v3.1.0
-```
-
 Grant the Helm service account the cluster-admin role.
 
 ```shell
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.2.0</version>
+        <version>3.3.0</version>
     </parent>
 
     <artifactId>integration-tests</artifactId>
diff --git a/json-schema-generator/pom.xml b/json-schema-generator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</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.2.0
-appVersion: 3.2.0
+version: 3.3.0
+appVersion: 3.3.0
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 container image containing the operator.
-image: "ghcr.io/oracle/weblogic-kubernetes-operator:3.2.0"
+image: "ghcr.io/oracle/weblogic-kubernetes-operator:3.3.0"
 
 # imagePullPolicy specifies the image pull policy for the operator's container 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
@@ -7,7 +7,7 @@ An operator is an application-specific controller that extends Kubernetes to cre
 #### Clone the operator repository to a Cloud Shell instance ####
 First, clone the operator git repository to OCI Cloud Shell.
 ```shell
-$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git -b v2.5.0
+$ git clone --branch v3.2.0 https://github.com/oracle/weblogic-kubernetes-operator.git
 ```
 The output should be similar to the following:
 ```shell
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.2.0</version>
+        <version>3.3.0</version>
     </parent>
 
     <artifactId>installation-tests</artifactId>
@@ -43,23 +43,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin-version}</version>
-                <executions>
-                    <execution><!-- helm chart package-->
-                        <id>package-helm-charts</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>${project.basedir}/package-helm-charts.sh</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -97,6 +80,30 @@
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>package-helm-charts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>${exec-maven-plugin-version}</version>
+                        <executions>
+                            <execution><!-- helm chart package-->
+                                <id>package-helm-charts</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>${project.basedir}/package-helm-charts.sh</executable>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>helm-installation-test</id>
             <build>
diff --git a/operator-build-maven-plugin/pom.xml b/operator-build-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>operator-parent</artifactId>
         <groupId>oracle.kubernetes</groupId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
 
     <artifactId>operator-build-maven-plugin</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.2.0</version>
+    <version>3.3.0</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.2.0</version>
+  <version>3.3.0</version>
 
   <modules>
     <module>operator</module>
diff --git a/swagger-generator/pom.xml b/swagger-generator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>oracle.kubernetes</groupId>
         <artifactId>operator-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
     </parent>
 
     <artifactId>operator-swagger</artifactId>
