Skip to content

Commit bd7043d

Browse files
rjeberhardrjeberhard
committed
Merge branch 'port-1412-changes' into 'main'
port 1412 changes from 4.2 to main See merge request weblogic-cloud/weblogic-kubernetes-operator!4922
2 parents 26bcaa6 + c595f5c commit bd7043d

36 files changed

+274
-103
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,16 @@ pipeline {
143143
defaultValue: "test-images/weblogic"
144144
)
145145
string(name: 'WEBLOGIC_IMAGE_TAG',
146-
description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
147-
defaultValue: '12.2.1.4'
146+
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
147+
defaultValue: '14.1.2.0-generic-jdk17-ol8'
148148
)
149149
string(name: 'FMWINFRA_IMAGE_NAME',
150150
description: 'FWM Infra image name. Default is the image name in BASE_IMAGES_REPO. Use middleware/fmw-infrastructure for OCR.',
151151
defaultValue: "test-images/fmw-infrastructure"
152152
)
153153
string(name: 'FMWINFRA_IMAGE_TAG',
154-
description: 'FWM Infra image tag',
155-
defaultValue: '12.2.1.4'
154+
description: '14.1.2.0-jdk17-ol8, 14.1.2.0-jdk17-ol9, 14.1.2.0-jdk21-ol8, 14.1.2.0-jdk21-ol9',
155+
defaultValue: '14.1.2.0-jdk17-ol8'
156156
)
157157
string(name: 'DB_IMAGE_NAME',
158158
description: 'Oracle DB image name. Default is the image name in BASE_IMAGES_REPO, use database/enterprise for OCR.',

‎Jenkinsfile.podman

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,24 +161,24 @@ pipeline {
161161
defaultValue: "test-images/weblogic"
162162
)
163163
string(name: 'WEBLOGIC_IMAGE_TAG',
164-
description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
165-
defaultValue: '12.2.1.4'
164+
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
165+
defaultValue: '14.1.2.0-generic-jdk17-ol8'
166166
)
167167
string(name: 'FMWINFRA_IMAGE_NAME',
168168
description: 'FWM Infra image name. Default is the image name in BASE_IMAGES_REPO. Use middleware/fmw-infrastructure for OCR.',
169169
defaultValue: "test-images/fmw-infrastructure"
170170
)
171171
string(name: 'FMWINFRA_IMAGE_TAG',
172-
description: 'FWM Infra image tag',
173-
defaultValue: '12.2.1.4'
172+
description: '14.1.2.0-jdk17-ol8, 14.1.2.0-jdk17-ol9, 14.1.2.0-jdk21-ol8, 14.1.2.0-jdk21-ol9',
173+
defaultValue: '14.1.2.0-jdk17-ol8'
174174
)
175175
string(name: 'DB_IMAGE_NAME',
176176
description: 'Oracle DB image name. Default is the image name in BASE_IMAGES_REPO, use database/enterprise for OCR.',
177177
defaultValue: "test-images/database/enterprise"
178178
)
179179
string(name: 'DB_IMAGE_TAG',
180180
description: 'Oracle DB image tag',
181-
defaultValue: '12.2.0.1-slim'
181+
defaultValue: '19.3.0.0'
182182
)
183183
string(name: 'MONITORING_EXPORTER_BRANCH',
184184
description: '',

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

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2025, 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;
@@ -13,6 +13,7 @@
1313
import javax.annotation.Nonnull;
1414

1515
import io.kubernetes.client.custom.V1Patch;
16+
import io.kubernetes.client.openapi.ApiException;
1617
import io.kubernetes.client.openapi.models.V1EnvVar;
1718
import io.kubernetes.client.openapi.models.V1LocalObjectReference;
1819
import io.kubernetes.client.openapi.models.V1ObjectMeta;
@@ -29,7 +30,6 @@
2930
import oracle.weblogic.domain.Model;
3031
import oracle.weblogic.domain.ServerPod;
3132
import oracle.weblogic.domain.ServerService;
32-
import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
3333
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
3434
import oracle.weblogic.kubernetes.annotations.Namespaces;
3535
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -48,7 +48,6 @@
4848
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO;
4949
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
5050
import static oracle.weblogic.kubernetes.TestConstants.CLUSTER_VERSION;
51-
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
5251
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
5352
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_STATUS_CONDITION_AVAILABLE_TYPE;
5453
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_STATUS_CONDITION_COMPLETED_TYPE;
@@ -80,8 +79,10 @@
8079
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
8180
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.configMapExist;
8281
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapFromFiles;
82+
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
8383
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
84-
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
84+
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
85+
import static oracle.weblogic.kubernetes.utils.DbUtils.deleteOracleDB;
8586
import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeExists;
8687
import static oracle.weblogic.kubernetes.utils.DomainUtils.checkDomainStatusConditionTypeHasExpectedStatus;
8788
import static oracle.weblogic.kubernetes.utils.DomainUtils.checkServerStatusPodPhaseAndPodReady;
@@ -728,25 +729,22 @@ void testMSBootFailureStatus() {
728729

729730
String rcuaccessSecretName = domainName + "-rcu-access";
730731
String opsswalletpassSecretName = domainName + "-opss-wallet-password-secret";
732+
String rcuSysPassword = "Oradoc_db1";
733+
String dbName = domainName + "my-oracle-db";
731734

732-
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
733-
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", domainNamespace, dbListenerPort, rcuSchemaPrefix, dbUrl,
734-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
735-
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
736-
rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
737-
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
738-
+ "dbUrl %s, dbListenerPost %s", rcuSchemaPrefix, domainNamespace, dbUrl, dbListenerPort));
735+
logger.info("Create Oracle DB in namespace: {0} ", domainNamespace);
736+
createBaseRepoSecret(domainNamespace);
737+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, rcuSysPassword, domainNamespace));
738+
739+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
740+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, rcuSchemaPrefix, dbUrl, domainNamespace);
741+
createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, rcuSchemaPrefix, dbUrl, domainNamespace);
739742

740743
// create RCU access secret
741744
logger.info("Creating RCU access secret: {0}, with prefix: {1}, dbUrl: {2}, schemapassword: {3})",
742745
rcuaccessSecretName, rcuSchemaPrefix, rcuSchemaPassword, dbUrl);
743-
assertDoesNotThrow(() -> createRcuAccessSecret(rcuaccessSecretName,
744-
domainNamespace,
745-
rcuSchemaPrefix,
746-
rcuSchemaPassword,
747-
dbUrl),
748-
String.format("createSecret failed for %s", rcuaccessSecretName));
749-
746+
createRcuAccessSecret(rcuaccessSecretName, domainNamespace, rcuSchemaPrefix, rcuSchemaPassword, dbUrl);
747+
750748
logger.info("Create OPSS wallet password secret");
751749
assertDoesNotThrow(() -> createOpsswalletpasswordSecret(
752750
opsswalletpassSecretName,
@@ -817,12 +815,7 @@ rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
817815
}
818816

819817
// delete Oracle database
820-
String dbPodName = "oracledb";
821-
assertDoesNotThrow(() -> Kubernetes.deleteDeployment(domainNamespace, "oracledb"),
822-
"deleting oracle db failed");
823-
824-
logger.info("Wait for the oracle Db pod: {0} to be deleted in namespace {1}", dbPodName, domainNamespace);
825-
PodUtils.checkPodDeleted(dbPodName, null, domainNamespace);
818+
deleteOracleDB(domainNamespace, dbName);
826819

827820
patchStr
828821
= "[{\"op\": \"replace\", \"path\": \"/spec/serverStartPolicy\", \"value\": \"IfNeeded\"}]";
@@ -842,6 +835,8 @@ rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
842835
checkServerStatusPodPhaseAndPodReady(domainName, domainNamespace, managedServerName, "Running", "False");
843836
}
844837
testPassed = true;
838+
} catch (ApiException ex) {
839+
logger.severe(ex.getLocalizedMessage());
845840
} finally {
846841
if (!testPassed) {
847842
LoggingUtil.generateLog(this, ns);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2025, 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;

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

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2025, 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;
@@ -12,6 +12,7 @@
1212
import java.nio.file.StandardOpenOption;
1313
import java.util.ArrayList;
1414
import java.util.Arrays;
15+
import java.util.Collection;
1516
import java.util.Collections;
1617
import java.util.HashMap;
1718
import java.util.List;
@@ -44,27 +45,31 @@
4445
import oracle.weblogic.kubernetes.assertions.impl.Cluster;
4546
import oracle.weblogic.kubernetes.logging.LoggingFacade;
4647
import oracle.weblogic.kubernetes.utils.ExecResult;
48+
import org.awaitility.core.ConditionFactory;
4749
import org.junit.jupiter.api.BeforeAll;
4850
import org.junit.jupiter.api.DisplayName;
4951
import org.junit.jupiter.api.Tag;
5052
import org.junit.jupiter.api.Test;
5153
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
5254

5355
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
56+
import static java.util.concurrent.TimeUnit.MINUTES;
57+
import static java.util.concurrent.TimeUnit.SECONDS;
5458
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
5559
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
56-
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_PREFIX;
60+
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO;
5761
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
62+
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_TENANCY;
5863
import static oracle.weblogic.kubernetes.TestConstants.CLUSTER_VERSION;
5964
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
6065
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
6166
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
6267
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST;
6368
import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_INTERVAL_SECONDS;
6469
import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_LIMIT_MINUTES;
65-
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME_DEFAULT;
66-
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
70+
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
6771
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
72+
import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
6873
import static oracle.weblogic.kubernetes.TestConstants.OKD;
6974
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
7075
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
@@ -76,6 +81,7 @@
7681
import static oracle.weblogic.kubernetes.actions.TestActions.execCommand;
7782
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
7883
import static oracle.weblogic.kubernetes.actions.TestActions.imagePull;
84+
import static oracle.weblogic.kubernetes.actions.TestActions.imagePush;
7985
import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
8086
import static oracle.weblogic.kubernetes.actions.impl.Domain.shutdown;
8187
import static oracle.weblogic.kubernetes.assertions.TestAssertions.podDoesNotExist;
@@ -103,6 +109,7 @@
103109
import static oracle.weblogic.kubernetes.utils.SecretUtils.createOpsswalletpasswordSecret;
104110
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
105111
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
112+
import static org.awaitility.Awaitility.with;
106113
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
107114
import static org.junit.jupiter.api.Assertions.assertNotNull;
108115
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -133,8 +140,15 @@ class ItFmwDomainOnPVUpgrade {
133140

134141
private final String fmwModelFilePrefix = "model-fmwdomain-upgrade";
135142

136-
private final String imageTag1412 = "14.1.2.0.0-jdk17";
137-
private final String image1412 = BASE_IMAGES_PREFIX + FMWINFRA_IMAGE_NAME_DEFAULT + ":" + imageTag1412;
143+
private static final String imageTag12214 = "12.2.1.4";
144+
private static final String image12214 = FMWINFRA_IMAGE_NAME + ":" + imageTag12214;
145+
private static final String imageTag1412 = "14.1.2.0-jdk17-ol8";
146+
private static final String image1412 = FMWINFRA_IMAGE_NAME + ":" + imageTag1412;
147+
148+
private static ConditionFactory withVeryLongRetryPolicy
149+
= with().pollDelay(0, SECONDS)
150+
.and().with().pollInterval(10, SECONDS)
151+
.atMost(30, MINUTES).await();
138152

139153
/**
140154
* Assigns unique namespaces for DB, operator and domain.
@@ -189,6 +203,20 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
189203
// create pull secrets for domainNamespace when running in non Kind Kubernetes cluster
190204
// this secret is used only for non-kind cluster
191205
createBaseRepoSecret(domainNamespace);
206+
if (KIND_REPO != null) {
207+
Collection<String> images = new ArrayList<>();
208+
images.add(image12214);
209+
images.add(image1412);
210+
211+
for (String image : images) {
212+
testUntil(
213+
withVeryLongRetryPolicy,
214+
pullImageFromBaseRepoAndPushToKind(image),
215+
logger,
216+
"pullImageFromBaseRepoAndPushToKind for image {0} to be successful",
217+
image);
218+
}
219+
}
192220
}
193221

194222
/**
@@ -342,7 +370,7 @@ private void createDomain(String domainName, String startMode, String rcuSchemap
342370
DOMAINHOMEPREFIX,
343371
replicaCount,
344372
configuration,
345-
FMWINFRA_IMAGE_TO_USE_IN_SPEC);
373+
image12214);
346374

347375
// Set the inter-pod anti-affinity for the domain custom resource
348376
setPodAntiAffinity(domain);
@@ -587,4 +615,11 @@ private static DomainResource createDomainResourceOnPv(String domainUid,
587615
return domain;
588616
}
589617

618+
private static Callable<Boolean> pullImageFromBaseRepoAndPushToKind(String image) {
619+
return (() -> {
620+
String kindRepoImage = KIND_REPO + image.substring(BASE_IMAGES_REPO.length() + BASE_IMAGES_TENANCY.length() + 2);
621+
return imagePull(image) && imageTag(image, kindRepoImage) && imagePush(kindRepoImage);
622+
});
623+
}
624+
590625
}

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2025, 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;
@@ -88,6 +88,7 @@
8888
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
8989
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
9090
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME_DEFAULT;
91+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
9192
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
9293
import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
9394
import static oracle.weblogic.kubernetes.actions.ActionConstants.ITTESTS_DIR;
@@ -225,7 +226,16 @@ class ItIntrospectVersion {
225226

226227
private static Path clusterViewAppPath;
227228
private static LoggingFacade logger = null;
228-
private static final int managedServerPort = 7100;
229+
private static int managedServerPort;
230+
231+
static {
232+
if (WEBLOGIC_IMAGE_TAG.contains("12")) {
233+
managedServerPort = 7100;
234+
} else {
235+
managedServerPort = 7001;
236+
}
237+
}
238+
229239
private static int adminPort = 7001;
230240
private static String hostHeader;
231241

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 2025, 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;
@@ -539,6 +539,7 @@ private int enableIstio(String clusterName, String domainUid, String namespace,
539539
templateMap.put("DUID", domainUid);
540540
templateMap.put("ADMIN_SERVICE", adminServerPodName);
541541
templateMap.put("CLUSTER_SERVICE", clusterService);
542+
templateMap.put("MANAGED_SERVER_PORT", "7001");
542543

543544
Path srcHttpFile = Paths.get(RESOURCE_DIR, "istio", "istio-http-template.yaml");
544545
Path targetHttpFile = assertDoesNotThrow(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2025, 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;
@@ -183,6 +183,7 @@ void testIstioDomainHomeInImage() throws UnknownHostException {
183183
templateMap.put("DUID", domainUid);
184184
templateMap.put("ADMIN_SERVICE",adminServerPodName);
185185
templateMap.put("CLUSTER_SERVICE", clusterService);
186+
templateMap.put("MANAGED_SERVER_PORT", "8001");
186187

187188
Path srcHttpFile = Paths.get(RESOURCE_DIR, "istio", "istio-http-template.yaml");
188189
Path targetHttpFile = assertDoesNotThrow(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2025, 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;
@@ -319,6 +319,7 @@ void testIstioDomainHomeInPv() throws UnknownHostException {
319319
templateMap.put("DUID", domainUid);
320320
templateMap.put("ADMIN_SERVICE",adminServerPodName);
321321
templateMap.put("CLUSTER_SERVICE", clusterService);
322+
templateMap.put("MANAGED_SERVER_PORT", "8001");
322323

323324
Path srcHttpFile = Paths.get(RESOURCE_DIR, "istio", "istio-http-template.yaml");
324325
Path targetHttpFile = assertDoesNotThrow(

0 commit comments

Comments
 (0)