Skip to content

Commit 38938d8

Browse files
authored
Backport changes for OWLS-102533 - override the default YAML size limit to accomodate the SnakeYAML change. (#3473)
1 parent d54c92a commit 38938d8

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,4 +327,5 @@ public interface TestConstants {
327327
Optional.ofNullable(System.getenv("HTTPS_PROXY")).orElse(System.getenv("https_proxy"));
328328
public static final String NO_PROXY =
329329
Optional.ofNullable(System.getenv("NO_PROXY")).orElse(System.getenv("no_proxy"));
330+
public static final String YAML_MAX_FILE_SIZE_PROPERTY = "-Dwdt.config.yaml.max.file.size=25000000";
330331
}

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/WebLogicImageTool.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import oracle.weblogic.kubernetes.logging.LoggingFacade;
99

10+
import static oracle.weblogic.kubernetes.TestConstants.YAML_MAX_FILE_SIZE_PROPERTY;
1011
import static oracle.weblogic.kubernetes.actions.ActionConstants.IMAGE_TOOL;
1112
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_ZIP_PATH;
1213
import static oracle.weblogic.kubernetes.actions.impl.primitive.Command.defaultCommandParams;
@@ -102,6 +103,7 @@ private String buildiWitCommand() {
102103
+ " --tag " + params.modelImageName() + ":" + params.modelImageTag()
103104
+ " --fromImage " + params.baseImageName() + ":" + params.baseImageTag()
104105
+ " --wdtDomainType " + params.domainType()
106+
+ " --wdtJavaOptions " + YAML_MAX_FILE_SIZE_PROPERTY
105107
+ " --chown oracle:root";
106108

107109
if (params.wdtModelOnly()) {

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
2828
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
2929
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
30+
import static oracle.weblogic.kubernetes.TestConstants.YAML_MAX_FILE_SIZE_PROPERTY;
3031
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
3132
import static oracle.weblogic.kubernetes.utils.ApplicationUtils.callWebAppAndWaitTillReady;
3233
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
@@ -41,6 +42,7 @@
4142
* Common utility methods for FMW Domain.
4243
*/
4344
public class FmwUtils {
45+
4446
/**
4547
* Construct a domain object with the given parameters that can be used to create a domain resource.
4648
* @param domainUid unique Uid of the domain
@@ -84,7 +86,10 @@ public static Domain createDomainResource(
8486
.value("-Dweblogic.StdoutDebugEnabled=false"))
8587
.addEnvItem(new V1EnvVar()
8688
.name("USER_MEM_ARGS")
87-
.value("-Djava.security.egd=file:/dev/./urandom ")))
89+
.value("-Djava.security.egd=file:/dev/./urandom "))
90+
.addEnvItem(new V1EnvVar()
91+
.name("WLSDEPLOY_PROPERTIES")
92+
.value(YAML_MAX_FILE_SIZE_PROPERTY)))
8893
.adminServer(new AdminServer()
8994
.serverStartState("RUNNING")
9095
.adminService(new AdminService()

0 commit comments

Comments
 (0)