Skip to content

Commit 0bd8a97

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-117553' into 'release/4.2'
[podman] backport MR 4621 to release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4669
2 parents a3d5667 + 9b6b4d8 commit 0bd8a97

File tree

2 files changed

+55
-8
lines changed

2 files changed

+55
-8
lines changed

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 2024, 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;
@@ -45,17 +45,21 @@
4545
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
4646
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
4747
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
48+
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
4849
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
4950
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
5051
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
5152
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
5253
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
54+
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_EXTERNAL_REST_HTTPSPORT;
5355
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO;
5456
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_PASSWORD;
5557
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
5658
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_USERNAME;
5759
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
5860
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
61+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
62+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
5963
import static oracle.weblogic.kubernetes.TestConstants.WLS_DOMAIN_TYPE;
6064
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
6165
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
@@ -146,9 +150,15 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
146150
// install and verify operator with REST API
147151
logger.info("Install an operator in namespace {0}, managing namespace {1} and {2}",
148152
opNamespace, domainNamespace, domainNamespace2);
149-
installAndVerifyOperator(opNamespace, opServiceAccount, true, 0,
150-
domainNamespace, domainNamespace2);
151-
externalRestHttpsPort = getServiceNodePort(opNamespace, "external-weblogic-operator-svc");
153+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
154+
installAndVerifyOperator(opNamespace, opServiceAccount, true, OPERATOR_EXTERNAL_REST_HTTPSPORT,
155+
domainNamespace, domainNamespace2);
156+
externalRestHttpsPort = OPERATOR_EXTERNAL_REST_HTTPSPORT;
157+
} else {
158+
installAndVerifyOperator(opNamespace, opServiceAccount, true, 0,
159+
domainNamespace, domainNamespace2);
160+
externalRestHttpsPort = getServiceNodePort(opNamespace, "external-weblogic-operator-svc");
161+
}
152162

153163
// create a mii domain resource with one cluster
154164
logger.info("Create model-in-image domain {0} in namespace {1}, and wait until it comes up",

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

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, 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;
@@ -7,6 +7,8 @@
77
import java.util.Collections;
88
import java.util.List;
99

10+
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
11+
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
1012
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
1113
import oracle.weblogic.kubernetes.annotations.Namespaces;
1214
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -16,9 +18,15 @@
1618
import org.junit.jupiter.api.Tag;
1719
import org.junit.jupiter.api.Test;
1820

21+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
22+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
23+
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
24+
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
1925
import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
2026
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
2127
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
28+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
29+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
2230
import static oracle.weblogic.kubernetes.actions.TestActions.deleteClusterCustomResource;
2331
import static oracle.weblogic.kubernetes.actions.TestActions.getOperatorPodName;
2432
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -69,6 +77,7 @@ class ItWDTModelNoServer {
6977
private static final String MII_IMAGE_NAME = "wdtmodelnoserver-mii";
7078
private static final int replicaCount = 2;
7179
private static final String internalPort = "8001";
80+
private static final int ADMIN_SERVER_PORT = 7001;
7281
private static final String appPath = "sample-war/index.jsp";
7382
private static final String clusterName = "cluster-1";
7483

@@ -532,9 +541,37 @@ private void checkAdminServerName(String adminServerPodName, String expectedAdmi
532541
int adminServiceNodePort
533542
= getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default");
534543
assertNotEquals(-1, adminServiceNodePort, "admin server default node port is not valid");
535-
assertTrue(checkSystemResourceDomainConfig(adminSvcExtHost, adminServiceNodePort,
536-
"\"adminServerName\": \"" + expectedAdminServerName + "\""),
537-
"Admin server name is not '" + expectedAdminServerName + "'");
544+
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
545+
assertTrue(checkSystemResourceConfigViaAdminPod(adminServerPodName,
546+
"\"adminServerName\": \"" + expectedAdminServerName + "\""),
547+
"Admin server name is not '" + expectedAdminServerName + "'");
548+
} else {
549+
assertTrue(checkSystemResourceDomainConfig(adminSvcExtHost, adminServiceNodePort,
550+
"\"adminServerName\": \"" + expectedAdminServerName + "\""),
551+
"Admin server name is not '" + expectedAdminServerName + "'");
552+
}
538553
logger.info("AdminServerName is {0}", expectedAdminServerName);
539554
}
555+
556+
private boolean checkSystemResourceConfigViaAdminPod(String adminServerPodName,
557+
String expectedValue) {
558+
final LoggingFacade logger = getLogger();
559+
560+
StringBuffer curlString = new StringBuffer(KUBERNETES_CLI + " exec -n "
561+
+ domainNamespace + " " + adminServerPodName)
562+
.append(" -- /bin/bash -c \"")
563+
.append("curl -g --user ")
564+
.append(ADMIN_USERNAME_DEFAULT + ":" + ADMIN_PASSWORD_DEFAULT)
565+
.append(" http://" + adminServerPodName + ":" + ADMIN_SERVER_PORT)
566+
.append("/management/weblogic/latest/domainConfig")
567+
.append("/")
568+
.append(" \"");
569+
570+
logger.info("checkSystemResource: curl command {0}", new String(curlString));
571+
return Command
572+
.withParams(new CommandParams()
573+
.command(curlString.toString()))
574+
.executeAndVerify(expectedValue);
575+
}
576+
540577
}

0 commit comments

Comments
 (0)