Skip to content

Commit 35819a8

Browse files
committed
Merge branch 'removeconsoleaccess-sankar1' into 'main'
Fix for 1412 failures in dynamic update integration tests and ItConfigDistributionStrategy See merge request weblogic-cloud/weblogic-kubernetes-operator!4594
2 parents 4a249b1 + 3681771 commit 35819a8

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,11 @@ public void afterEach() {
282282
headers = new HashMap<>();
283283
headers.put("host", hostHeader);
284284
}
285+
boolean ipv6 = K8S_NODEPORT_HOST.contains(":");
285286
String baseUri = "http://" + hostAndPort + "/clusterview/";
286287
String serverListUri = "ClusterViewServlet?user=" + ADMIN_USERNAME_DEFAULT
287-
+ "&password=" + ADMIN_PASSWORD_DEFAULT;
288+
+ "&password=" + ADMIN_PASSWORD_DEFAULT + "&ipv6=" + ipv6;
289+
288290
HttpResponse<String> response = OracleHttpClient.get(baseUri + serverListUri, headers, true);
289291
return response.statusCode() == 200;
290292
},

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class ItDiagnosticsFailedCondition {
116116
private static String domainNamespace = null;
117117
int replicaCount = 2;
118118
private String wlClusterName = "cluster-1";
119+
private String adminServerName = "admin-server";
119120

120121

121122
private static String adminSecretName;
@@ -775,7 +776,9 @@ rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
775776
opsswalletpassSecretName,
776777
replicaCount,
777778
fmwMiiImage,
778-
5L);
779+
5L,
780+
"-Dcoherence.wka=" + domainName + "-" + adminServerName
781+
);
779782

780783
getLogger().info("Creating cluster {0} in namespace {1}", clusterResName, domainNamespace);
781784

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ public static DomainResource createDomainResourceWithLogHome(
764764
pvcName,
765765
configMapName,
766766
dbSecretName,
767-
"-Dweblogic.security.SSL.ignoreHostnameVerification=true",
767+
"-Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.security.remoteAnonymousRMIT3Enabled=true",
768768
onlineUpdateEnabled,
769769
setDataHome);
770770
}

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,17 @@ public class FmwUtils {
8282
* @param rcuAccessSecretName name of RCU access secret
8383
* @param opssWalletPasswordSecretName name of opss wallet password secret
8484
* @param miiImage name of model in image
85+
* @param javaOpt optional JAVA_OPT parameter
8586
* @return Domain WebLogic domain
8687
*/
8788
public static DomainResource createDomainResource(
8889
String domainUid, String domNamespace, String adminSecretName,
8990
String repoSecretName, String encryptionSecretName, String rcuAccessSecretName,
90-
String opssWalletPasswordSecretName, String miiImage) {
91+
String opssWalletPasswordSecretName, String miiImage, String...javaOpt) {
92+
93+
if (javaOpt.length == 0) {
94+
javaOpt[0] = "-Dweblogic.StdoutDebugEnabled=false";
95+
}
9196

9297
// create the domain CR
9398
DomainResource domain = new DomainResource()
@@ -113,7 +118,7 @@ public static DomainResource createDomainResource(
113118
.serverPod(new ServerPod()
114119
.addEnvItem(new V1EnvVar()
115120
.name("JAVA_OPTIONS")
116-
.value("-Dweblogic.StdoutDebugEnabled=false"))
121+
.value(javaOpt[0]))
117122
.addEnvItem(new V1EnvVar()
118123
.name("USER_MEM_ARGS")
119124
.value("-Djava.security.egd=file:/dev/./urandom "))
@@ -154,11 +159,12 @@ public static DomainResource createDomainResource(
154159
public static DomainResource createDomainResourceWithMaxServerPodReadyWaitTime(
155160
String domainUid, String domNamespace, String adminSecretName,
156161
String repoSecretName, String encryptionSecretName, String rcuAccessSecretName,
157-
String opssWalletPasswordSecretName, int replicaCount, String miiImage, long maxServerPodReadyWaitTime) {
162+
String opssWalletPasswordSecretName, int replicaCount, String miiImage,
163+
long maxServerPodReadyWaitTime, String javaOpt) {
158164
// create the domain CR
159165
DomainResource domain = createDomainResource(domainUid, domNamespace,
160166
adminSecretName, repoSecretName, encryptionSecretName,
161-
rcuAccessSecretName, opssWalletPasswordSecretName, miiImage);
167+
rcuAccessSecretName, opssWalletPasswordSecretName, miiImage, javaOpt);
162168
domain.getSpec().getServerPod().setMaxReadyWaitTimeSeconds(maxServerPodReadyWaitTime);
163169

164170
return domain;

0 commit comments

Comments
 (0)