Skip to content

Commit 69a7d3c

Browse files
committed
Merge branch 'OWLS-112534' into 'main'
Upgrade tests to 1412 images See merge request weblogic-cloud/weblogic-kubernetes-operator!4518
2 parents 124ec36 + 59aad91 commit 69a7d3c

File tree

5 files changed

+1274
-12
lines changed

5 files changed

+1274
-12
lines changed

integration-tests/src/test/java/oracle/weblogic/domain/Model.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.domain;
@@ -20,25 +20,25 @@ public class Model {
2020
@ApiModelProperty(
2121
value = "WDT domain type: Legal values: WLS, RestrictedJRF, JRF. Defaults to WLS.",
2222
allowableValues = "WLS, RestrictedJRF, JRF")
23-
private String domainType;
23+
public String domainType;
2424

2525
@ApiModelProperty("WDT config map name.")
26-
private String configMap;
26+
public String configMap;
2727

2828
@ApiModelProperty("Location of the WebLogic Deploy Tooling model home. Defaults to `/u01/wdt/models` if no "
2929
+ "`spec.configuration.model.AuxiliaryImages` are specified, and to `/aux/models` otherwise.")
30-
private String modelHome;
30+
public String modelHome;
3131

3232
@ApiModelProperty("Location of the WebLogic Deploy Tooling installation. Defaults to `/u01/wdt/weblogic-deploy` if "
3333
+ "no `spec.configuration.model.AuxiliaryImages` are specified, and to `/aux/weblogic-deploy` otherwise.")
34-
private String wdtInstallHome;
34+
public String wdtInstallHome;
3535

3636
@ApiModelProperty("Online update option for Model In Image dynamic update.")
37-
private OnlineUpdate onlineUpdate;
37+
public OnlineUpdate onlineUpdate;
3838

3939
@ApiModelProperty(
4040
"Runtime encryption secret. Required when domainHomeSourceType is set to FromModel.")
41-
private String runtimeEncryptionSecret;
41+
public String runtimeEncryptionSecret;
4242

4343
/**
4444
* The auxiliary images.
@@ -49,23 +49,23 @@ public class Model {
4949
+ "modifications to the pod's base image `domain.spec.image`. "
5050
+ "This feature internally uses a Kubernetes emptyDir volume and Kubernetes init containers to share "
5151
+ "the files from the additional images with the pod.")
52-
private List<AuxiliaryImage> auxiliaryImages;
52+
public List<AuxiliaryImage> auxiliaryImages;
5353

5454
@ApiModelProperty("The auxiliary image volume mount path. This is an advanced setting that rarely needs to be "
5555
+ "configured. Defaults to `/aux`, which means the emptyDir volume will be mounted at `/aux` path in the "
5656
+ "WebLogic-Server container within every pod. The defaults for `modelHome` and `wdtInstallHome` will start "
5757
+ "with the new mount path, and files from `sourceModelHome` and `sourceWDTInstallHome` will be copied to "
5858
+ "the new default locations.")
59-
private String auxiliaryImageVolumeMountPath;
59+
public String auxiliaryImageVolumeMountPath;
6060

6161
@ApiModelProperty("The emptyDir volume withAuxiliaryImageVolumeMedium. This is an advanced setting that rarely "
6262
+ "needs to be configured. Defaults to unset, which means the volume's files are stored on the local node's "
6363
+ "file system for the life of the pod.")
64-
private String auxiliaryImageVolumeMedium;
64+
public String auxiliaryImageVolumeMedium;
6565

6666
@ApiModelProperty("The emptyDir volume size limit. This is an advanced setting that rarely needs to be configured. "
6767
+ "Defaults to unset.")
68-
private String auxiliaryImageVolumeSizeLimit;
68+
public String auxiliaryImageVolumeSizeLimit;
6969

7070
public Model domainType(String domainType) {
7171
this.domainType = domainType;

0 commit comments

Comments
 (0)