Skip to content

Commit 158b085

Browse files
anpanigrANTARYAMI.PANIGRAHI@ORACLE.COM
anpanigr
and
ANTARYAMI.PANIGRAHI@ORACLE.COM
authored
Backport clear text password/build failure/wdt update change to Release/3.3 (#2753)
* Backport clear text password/build failure/wdt update change to Release/3.3 Co-authored-by: ANTARYAMI.PANIGRAHI@ORACLE.COM <anpanigr@phx3182b0a.subnet4ad3phx.devweblogicphx.oraclevcn.com>
1 parent 4f54380 commit 158b085

24 files changed

+145
-82
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -38,6 +38,8 @@
3838

3939
import static java.util.concurrent.TimeUnit.MINUTES;
4040
import static java.util.concurrent.TimeUnit.SECONDS;
41+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
42+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4143
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4244
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
4345
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
@@ -270,8 +272,8 @@ private static void createAndVerifyDomain(String domImage) {
270272
// create secret for admin credentials
271273
logger.info("Create secret for admin credentials");
272274
String adminSecretName = "weblogic-credentials";
273-
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace,
274-
"weblogic", "welcome1"),
275+
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName,
276+
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
275277
String.format("create secret for admin credentials failed for %s", adminSecretName));
276278

277279
// create encryption secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDedicatedMode.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -32,7 +32,9 @@
3232
import org.junit.jupiter.api.Test;
3333
import org.junit.jupiter.api.TestMethodOrder;
3434

35+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
3536
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
37+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3638
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3739
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
3840
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
@@ -280,8 +282,8 @@ private void createDomain(String domainNamespace) {
280282
// create secret for admin credentials
281283
logger.info("Create secret for admin credentials");
282284
String adminSecretName = "weblogic-credentials";
283-
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace,
284-
"weblogic", "welcome1"),
285+
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName,
286+
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
285287
String.format("create secret for admin credentials failed for %s", adminSecretName));
286288

287289
// create encryption secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636

3737
import static java.util.concurrent.TimeUnit.MINUTES;
3838
import static java.util.concurrent.TimeUnit.SECONDS;
39+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
40+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3941
import static oracle.weblogic.kubernetes.TestConstants.COPY_WLS_LOGGING_EXPORTER_FILE_NAME;
4042
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4143
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST;
@@ -364,8 +366,8 @@ private static void createAndVerifyDomain(String miiImage) {
364366
// create secret for admin credentials
365367
logger.info("Create secret for admin credentials");
366368
String adminSecretName = "weblogic-credentials";
367-
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace,
368-
"weblogic", "welcome1"),
369+
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName,
370+
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
369371
String.format("create secret for admin credentials failed for %s", adminSecretName));
370372

371373
// create encryption secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
5252
import static java.util.concurrent.TimeUnit.MINUTES;
5353
import static java.util.concurrent.TimeUnit.SECONDS;
54+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
55+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
5456
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
5557
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST;
5658
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HTTPS_PORT;
@@ -327,7 +329,8 @@ private static void createAndVerifyDomain(String miiImage) {
327329
logger.info("Create secret for admin credentials");
328330
final String adminSecretName = "weblogic-credentials";
329331
assertDoesNotThrow(() -> createSecretWithUsernamePasswordElk(adminSecretName, domainNamespace,
330-
"weblogic", "welcome1", elasticSearchHost, elasticSearchPort),
332+
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT,
333+
elasticSearchHost, elasticSearchPort),
331334
String.format("create secret for admin credentials failed for %s", adminSecretName));
332335

333336
// create encryption secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2022, 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.kubernetes;
@@ -25,6 +25,8 @@
2525

2626
import static java.util.concurrent.TimeUnit.MINUTES;
2727
import static java.util.concurrent.TimeUnit.SECONDS;
28+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
29+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
2830
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
2931
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
3032
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
@@ -163,8 +165,8 @@ void testFmwBigCMModelInImage() {
163165
assertDoesNotThrow(() -> createSecretWithUsernamePassword(
164166
adminSecretName,
165167
jrfDomainNamespace,
166-
"weblogic",
167-
"welcome1"),
168+
ADMIN_USERNAME_DEFAULT,
169+
ADMIN_PASSWORD_DEFAULT),
168170
String.format("createSecret failed for %s", adminSecretName));
169171

170172
// create encryption secret
@@ -191,7 +193,7 @@ void testFmwBigCMModelInImage() {
191193
assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
192194
opsswalletpassSecretName,
193195
jrfDomainNamespace,
194-
"welcome1"),
196+
ADMIN_PASSWORD_DEFAULT),
195197
String.format("createSecret failed for %s", opsswalletpassSecretName));
196198

197199
logger.info("Create an image with jrf model file");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2022, 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.kubernetes;
@@ -190,7 +190,7 @@ private void createFmwDomainAndVerify() {
190190
assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
191191
opsswalletpassSecretName,
192192
domainNamespace,
193-
"welcome1"),
193+
ADMIN_PASSWORD_DEFAULT),
194194
String.format("createSecret failed for %s", opsswalletpassSecretName));
195195

196196
logger.info("Create an image with jrf model file");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -26,6 +26,8 @@
2626

2727
import static java.util.concurrent.TimeUnit.MINUTES;
2828
import static java.util.concurrent.TimeUnit.SECONDS;
29+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
30+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
2931
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
3032
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
3133
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
@@ -168,8 +170,8 @@ void testFmwModelInImage() {
168170
assertDoesNotThrow(() -> createSecretWithUsernamePassword(
169171
adminSecretName,
170172
fmwDomainNamespace,
171-
"weblogic",
172-
"welcome1"),
173+
ADMIN_USERNAME_DEFAULT,
174+
ADMIN_PASSWORD_DEFAULT),
173175
String.format("createSecret failed for %s", adminSecretName));
174176

175177
// create encryption secret
@@ -196,7 +198,7 @@ void testFmwModelInImage() {
196198
assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
197199
opsswalletpassSecretName,
198200
fmwDomainNamespace,
199-
"welcome1"),
201+
ADMIN_PASSWORD_DEFAULT),
200202
String.format("createSecret failed for %s", opsswalletpassSecretName));
201203

202204
logger.info("Create an image with jrf model file");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItInitContainers.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -33,7 +33,9 @@
3333
import org.junit.jupiter.api.Tag;
3434
import org.junit.jupiter.api.Test;
3535

36+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
3637
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
38+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3739
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3840
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
3941
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
@@ -137,7 +139,7 @@ public static void initAll(@Namespaces(5) List<String> namespaces) {
137139
.helmParams(opHelmParams)
138140
.javaLoggingLevel(("FINE"));
139141
assertTrue(upgradeAndVerifyOperator(opNamespace, opParams),
140-
"Failed to upgrade operator to FINE logging leve");
142+
"Failed to upgrade operator to FINE logging level");
141143
}
142144

143145
private static void createSecrets(String domainNamespace) {
@@ -154,7 +156,8 @@ private static void createSecrets(String domainNamespace) {
154156
// create secret for admin credentials
155157
logger.info("Creating secret for admin credentials");
156158

157-
createSecretWithUsernamePassword(adminSecretName, domainNamespace, "weblogic", "welcome1");
159+
createSecretWithUsernamePassword(adminSecretName, domainNamespace,
160+
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
158161

159162
// create encryption secret
160163
logger.info("Creating encryption secret");

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -38,6 +38,8 @@
3838

3939
import static java.util.concurrent.TimeUnit.MINUTES;
4040
import static java.util.concurrent.TimeUnit.SECONDS;
41+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
42+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4143
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4244
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
4345
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
@@ -279,8 +281,8 @@ private static void createAndVerifyDomain(String domImage) {
279281
// create secret for admin credentials
280282
logger.info("Create secret for admin credentials");
281283
String adminSecretName = "weblogic-credentials";
282-
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainNamespace,
283-
"weblogic", "welcome1"),
284+
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName,
285+
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
284286
String.format("create secret for admin credentials failed for %s", adminSecretName));
285287

286288
// create encryption secret

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2022, 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.kubernetes;
@@ -33,7 +33,9 @@
3333
import org.junit.jupiter.api.Tag;
3434
import org.junit.jupiter.api.Test;
3535

36+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
3637
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_SERVER_NAME_BASE;
38+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3739
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3840
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3941
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
@@ -266,8 +268,8 @@ private static void createAndVerifyDomain(String domImage) {
266268
// create secret for admin credentials
267269
logger.info("Create secret for admin credentials");
268270
String adminSecretName = "weblogic-credentials";
269-
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName, domainInImageNamespace,
270-
"weblogic", "welcome1"),
271+
assertDoesNotThrow(() -> createSecretWithUsernamePassword(adminSecretName,
272+
domainInImageNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT),
271273
String.format("create secret for admin credentials failed for %s", adminSecretName));
272274

273275
// create encryption secret

0 commit comments

Comments
 (0)