Continue removing model-in-image

Author: rjeberhard

buildtime-reports/pom.xml

@@ -63,11 +63,6 @@
             <artifactId>operator-integration-tests</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>new-integration-tests</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
 </project>

docs-source/content/faq/cannot-pull-image.md

@@ -91,7 +91,7 @@ Here is an example of part of a domain custom resource file with the `imagePullS
 specified:
 
 ```
-apiVersion: "weblogic.oracle/v2"
+apiVersion: "weblogic.oracle/v6"
 kind: Domain
 metadata:
   name: domain1
@@ -101,7 +101,7 @@ metadata:
     weblogic.domainUID: domain1
 spec:
   domainHome: /u01/oracle/user_projects/domains/domain1
-  domainHomeSourceType: Image
+  domainHomeInImage: true
   image: "some.registry.com/owner/domain1:1.0"
   imagePullPolicy: "IfNotPresent"
   imagePullSecrets:

docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

@@ -183,7 +183,7 @@ The content of the generated `domain.yaml`:
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v2"
+apiVersion: "weblogic.oracle/v6"
 kind: Domain
 metadata:
   name: domain1
@@ -195,7 +195,7 @@ spec:
   # The WebLogic Domain Home
   domainHome: /u01/oracle/user_projects/domains/domain1
   # Set domain home type to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
-  domainHomeSourceType: Image
+  domainHomeInImage: true
   # The WebLogic Server Docker image that the operator uses to start the domain
   image: "domain-home-in-image:12.2.1.4"
   # imagePullPolicy defaults to "Always" if image version is :latest

docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

@@ -151,7 +151,7 @@ The content of the generated `domain.yaml`:
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v2"
+apiVersion: "weblogic.oracle/v6"
 kind: Domain
 metadata:
   name: domain1
@@ -163,7 +163,7 @@ spec:
   # The WebLogic Domain Home
   domainHome: /shared/domains/domain1
   # Set domain home type to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
-  domainHomeSourceType: PersistentVolume
+  domainHomeInImage: false
   # The WebLogic Server Docker image that the operator uses to start the domain
   image: "container-registry.oracle.com/middleware/weblogic:12.2.1.4"
   # imagePullPolicy defaults to "Always" if image version is :latest

docs-source/content/samples/simple/domains/fmw-domain/_index.md

@@ -168,7 +168,7 @@ The content of the generated `domain.yaml`:
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v4"
+apiVersion: "weblogic.oracle/v5"
 kind: Domain
 metadata:
   name: fmw-domain
@@ -180,7 +180,7 @@ spec:
   # The WebLogic Domain Home
   domainHome: /shared/domains/fmw-domain
   # Set domain home type to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image
-  domainHomeSourceType: PersistentVolume
+  domainHomeInImage: false
   # The WebLogic Server Docker image that the Operator uses to start the domain
   image: "container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.4"
   # imagePullPolicy defaults to "Always" if image version is :latest

docs-source/content/samples/simple/domains/model-in-image/_index.md

@@ -813,7 +813,7 @@ Copy the following to a file called `/tmp/mii-sample/mii-initial.yaml` or simila
     #
     # If you are using 3.0.0-rc1, then the version on the following line
     # should be `v7` not `v6`.
-    apiVersion: "weblogic.oracle/v6"
+    apiVersion: "weblogic.oracle/v7"
     kind: Domain
     metadata:
       name: sample-domain1
@@ -823,7 +823,7 @@ Copy the following to a file called `/tmp/mii-sample/mii-initial.yaml` or simila
         weblogic.domainUID: sample-domain1
 
     spec:
-      # Set to 'FromModel' to indicate 'Model in Image'.
+      # For 3.0.0-rc1, set to 'FromModel' to indicate 'Model in Image'.
       domainHomeSourceType: FromModel
 
       # The WebLogic Domain Home, this must be a location within

docs-source/content/samples/simple/elastic-stack/weblogic-domain/_index.md

@@ -278,7 +278,7 @@ spec:
   - clusterName: cluster-1
     serverPod:
   domainHome: /u01/oracle/user_projects/domains/bobs-bookstore
-  domainHomeSourceType: Image
+  domainHomeInImage: true
   domainUID: bobs-bookstore
   experimental:
     istio:

docs-source/content/security/domain-security/image-protection.md

@@ -41,7 +41,7 @@ metadata:
     weblogic.resourceVersion: domain-v2
     weblogic.domainUID: domain1
 spec:
-  domainHomeSourceType: Image
+  domainHomeInImage: true
   image: "my-domain-home-in-image"
   imagePullPolicy: "IfNotPresent"
   imagePullSecrets:

docs-source/content/userguide/managing-domains/domain-resource.md

@@ -413,7 +413,7 @@ This example domain YAML file specifies that pods for WebLogic Server instances
 # Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
-apiVersion: "weblogic.oracle/v7"
+apiVersion: "weblogic.oracle/v6"
 kind: Domain
 metadata:
   name: domain1
@@ -423,7 +423,7 @@ metadata:
     weblogic.domainUID: domain1
 spec:
   domainHome: /u01/oracle/user_projects/domains/domain1
-  domainHomeSourceType: Image
+  domainHomeInImage: true
   image: "phx.ocir.io/weblogick8s/my-domain-home-in-image:12.2.1.4"
   imagePullPolicy: "IfNotPresent"
   imagePullSecrets:

operator/src/main/java/oracle/kubernetes/operator/DomainSourceType.java

@@ -5,6 +5,5 @@
 
 public enum DomainSourceType {
   Image,
-  PersistentVolume,
-  FromModel
+  PersistentVolume
 }