Skip to content

Commit 1d6074b

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-116899' into 'release/4.2'
backport MR 4630 to release/4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4636
2 parents 6cc3906 + 66dceda commit 1d6074b

File tree

6 files changed

+170
-136
lines changed

6 files changed

+170
-136
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ class ItDiagnosticsCompleteAvailableCondition {
6767

6868
private static final String cluster1Name = "cluster-1";
6969

70-
private static final String clusterResName = cluster1Name;
71-
7270
private static LoggingFacade logger = null;
7371
private static String domainNamespace1 = null;
7472
private static int replicaCount = 2;
@@ -132,7 +130,7 @@ void testCompleteAvailableConditionWithIfNeeded() {
132130
verifyDomainStatusConditionTypeDoesNotExist(domainUid, domainNamespace1, DOMAIN_STATUS_CONDITION_FAILED_TYPE);
133131
} finally {
134132
deleteDomainResource(domainNamespace1, domainUid);
135-
deleteClusterCustomResource(clusterResName, domainNamespace1);
133+
deleteClusterCustomResource(domainUid + "-" + cluster1Name, domainNamespace1);
136134
}
137135
}
138136

@@ -183,7 +181,7 @@ void testCompleteAvailableConditionWithAdminOnly() {
183181
verifyDomainStatusConditionTypeDoesNotExist(domainUid, domainNamespace1, DOMAIN_STATUS_CONDITION_FAILED_TYPE);
184182
} finally {
185183
deleteDomainResource(domainNamespace1, domainUid);
186-
deleteClusterCustomResource(clusterResName, domainNamespace1);
184+
deleteClusterCustomResource(domainUid + "-" + cluster1Name, domainNamespace1);
187185
}
188186
}
189187

@@ -235,7 +233,7 @@ void testCompleteAvailableConditionWithNever() {
235233

236234
} finally {
237235
deleteDomainResource(domainNamespace1, domainUid);
238-
deleteClusterCustomResource(clusterResName, domainNamespace1);
236+
deleteClusterCustomResource(domainUid + "-" + cluster1Name, domainNamespace1);
239237
}
240238
}
241239

@@ -255,7 +253,9 @@ void testCompleteAvailableConditionWithReplicaZero() {
255253

256254
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
257255
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
256+
String clusterResName = domainUid + "-" + cluster1Name;
258257
String patchStr;
258+
259259
try {
260260
logger.info("patch the cluster resource with new cluster replica 0");
261261
patchStr
@@ -310,6 +310,7 @@ void testCompleteAvailableConditionWithClusterNever() {
310310

311311
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
312312
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
313+
String clusterResName = domainUid + "-" + cluster1Name;
313314
String patchStr;
314315
try {
315316
logger.info("patch the cluster resource with cluster serverStartPolicy to Never");
@@ -355,6 +356,7 @@ void testCompleteAvailableConditionWithClusterNever() {
355356
@DisplayName("Test domain status condition with cluster replica set to larger than max size of cluster")
356357
void testCompleteAvailableConditionWithReplicaExceedMaxSizeWithoutChangingIntrospectVersion() {
357358
String domainUid = "diagnosticsdomain6";
359+
String clusterResName = domainUid + "-" + cluster1Name;
358360
createDomainAndVerify(domainUid);
359361

360362
try {
@@ -391,6 +393,7 @@ void testCompleteAvailableConditionWithReplicaExceedMaxSizeAndIntrospectVersionC
391393

392394
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
393395
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
396+
String clusterResName = domainUid + "-" + cluster1Name;
394397
String patchStr;
395398
try {
396399
int newReplicaCount = maxClusterSize + 1;
@@ -449,6 +452,7 @@ void testCompleteAvailableConditionWithReplicaLessThanMaxSize() {
449452

450453
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
451454
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
455+
String clusterResName = domainUid + "-" + cluster1Name;
452456
String patchStr;
453457
try {
454458
logger.info("patch the domain resource with replica less than max size of cluster");
@@ -510,6 +514,7 @@ void testCompleteAvailableConditionWithScaleUpDownCluster() {
510514

511515
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
512516
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
517+
String clusterResName = domainUid + "-" + cluster1Name;
513518

514519
try {
515520
// scale down the cluster
@@ -592,6 +597,7 @@ void testCompleteAvailableConditionWithNewRestartVersion() {
592597

593598
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
594599
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
600+
String clusterResName = domainUid + "-" + cluster1Name;
595601

596602
try {
597603
// get the pod creation time stamps
@@ -658,6 +664,7 @@ void testCompleteAvailableConditionWithNewImage() {
658664

659665
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
660666
String managedServerPodNamePrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
667+
String clusterResName = domainUid + "-" + cluster1Name;
661668

662669
try {
663670
// get the pod creation time stamps
@@ -733,6 +740,9 @@ private void createDomainAndVerify(String domainUid) {
733740
adminServerPodName,
734741
managedServerPodNamePrefix,
735742
replicaCount,
736-
List.of(cluster1Name));
743+
List.of(cluster1Name),
744+
false,
745+
null,
746+
true);
737747
}
738748
}

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@
2727
import oracle.weblogic.domain.DomainResource;
2828
import oracle.weblogic.domain.DomainSpec;
2929
import oracle.weblogic.domain.ServerPod;
30-
import oracle.weblogic.kubernetes.actions.impl.OperatorParams;
3130
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
3231
import oracle.weblogic.kubernetes.annotations.Namespaces;
3332
import oracle.weblogic.kubernetes.logging.LoggingFacade;
3433
import oracle.weblogic.kubernetes.utils.DomainUtils;
35-
import oracle.weblogic.kubernetes.utils.K8sEvents;
3634
import org.junit.jupiter.api.AfterAll;
3735
import org.junit.jupiter.api.BeforeAll;
3836
import org.junit.jupiter.api.DisplayName;
@@ -55,7 +53,6 @@
5553
import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolumeClaim;
5654
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
5755
import static oracle.weblogic.kubernetes.actions.TestActions.getNextIntrospectVersion;
58-
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
5956
import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
6057
import static oracle.weblogic.kubernetes.actions.TestActions.now;
6158
import static oracle.weblogic.kubernetes.actions.TestActions.scaleCluster;
@@ -101,7 +98,7 @@
10198
import static oracle.weblogic.kubernetes.utils.K8sEvents.checkDomainEventWithCount;
10299
import static oracle.weblogic.kubernetes.utils.K8sEvents.checkDomainFailedEventWithReason;
103100
import static oracle.weblogic.kubernetes.utils.K8sEvents.getDomainEventCount;
104-
import static oracle.weblogic.kubernetes.utils.K8sEvents.getOpGeneratedEventCount;
101+
import static oracle.weblogic.kubernetes.utils.K8sEvents.getOpGeneratedEventCountForResource;
105102
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
106103
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainResource;
107104
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createPV;
@@ -146,8 +143,6 @@ class ItKubernetesDomainEvents {
146143
private static String domainNamespace4 = null;
147144
private static String domainNamespace5 = null;
148145
private static String opServiceAccount = null;
149-
private static int externalRestHttpsPort = 0;
150-
private static OperatorParams opParams = null;
151146

152147
static final String cluster1Name = "mycluster";
153148
static final String cluster2Name = "cl2";
@@ -211,10 +206,9 @@ public static void initAll(@Namespaces(6) List<String> namespaces) {
211206
opServiceAccount = opNamespace + "-sa";
212207

213208
// install and verify operator with REST API
214-
opParams = installAndVerifyOperator(opNamespace, opServiceAccount,
209+
installAndVerifyOperator(opNamespace, opServiceAccount,
215210
true, 0, domainNamespace1, domainNamespace2, domainNamespace3,
216211
domainNamespace4, domainNamespace5);
217-
externalRestHttpsPort = getServiceNodePort(opNamespace, "external-weblogic-operator-svc");
218212

219213
createDomain(domainNamespace3, domainUid, pvName3, pvcName3);
220214
}
@@ -387,9 +381,7 @@ void testK8SEventsMultiClusterEvents() {
387381
logger.info("verify the Cluster_Available event is generated");
388382
checkEvent(opNamespace, domainNamespace3, domainUid,
389383
CLUSTER_CHANGED, "Normal", timestamp);
390-
assertEquals(1, getOpGeneratedEventCount(domainNamespace3, domainUid,
391-
CLUSTER_CHANGED, timestamp2));
392-
assertEquals(1, K8sEvents.getOpGeneratedEventCountForResource(domainNamespace3, domainUid, cluster2Name,
384+
assertEquals(1, getOpGeneratedEventCountForResource(domainNamespace3, domainUid, cluster2Name,
393385
CLUSTER_CHANGED, timestamp));
394386
checkEvent(opNamespace, domainNamespace3, domainUid,
395387
CLUSTER_AVAILABLE, "Normal", timestamp);
@@ -400,10 +392,10 @@ void testK8SEventsMultiClusterEvents() {
400392
checkEvent(opNamespace, domainNamespace3,
401393
domainUid, CLUSTER_COMPLETED, "Normal", timestamp2);
402394
logger.info("verify the only 1 Completed event for domain is generated");
403-
assertEquals(1, getOpGeneratedEventCount(domainNamespace3, domainUid,
395+
assertEquals(1, getOpGeneratedEventCountForResource(domainNamespace3, domainUid, domainUid,
404396
DOMAIN_COMPLETED, timestamp));
405397
logger.info("verify the only 1 ClusterCompleted event for domain is generated");
406-
assertEquals(1, getOpGeneratedEventCount(domainNamespace3, domainUid,
398+
assertEquals(1, getOpGeneratedEventCountForResource(domainNamespace3, domainUid, cluster2Name,
407399
CLUSTER_COMPLETED, timestamp2));
408400
}
409401

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2801,9 +2801,10 @@ public static V1JobList listJobs(String namespace) throws ApiException {
28012801
*/
28022802
public static V1Job getJob(String jobName, String namespace) throws ApiException {
28032803
V1JobList listJobs = listJobs(namespace);
2804-
for (V1Job job : listJobs.getItems()) {
2805-
if (job != null && job.getMetadata() != null) {
2806-
if (job.getMetadata().getName().equals(jobName)) {
2804+
if (listJobs != null) {
2805+
for (V1Job job : listJobs.getItems()) {
2806+
if (job.getMetadata() != null && job.getMetadata().getName() != null
2807+
&& job.getMetadata().getName().equals(jobName)) {
28072808
return job;
28082809
}
28092810
}

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/assertions/impl/Kubernetes.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 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.assertions.impl;
@@ -783,10 +783,13 @@ public static V1JobList listJobs(String namespace, String labelSelectors) {
783783
*/
784784
public static V1Job getJob(String namespace, String labelSelectors, String jobName)
785785
throws ApiException {
786-
List<V1Job> jobs = listJobs(namespace, labelSelectors).getItems();
787-
for (V1Job job : jobs) {
788-
if (job != null && job.getMetadata().getName().equals(jobName)) {
789-
return job;
786+
V1JobList jobList = listJobs(namespace, labelSelectors);
787+
if (jobList != null) {
788+
for (V1Job job : jobList.getItems()) {
789+
if (job.getMetadata() != null && job.getMetadata().getName() != null
790+
&& job.getMetadata().getName().equals(jobName)) {
791+
return job;
792+
}
790793
}
791794
}
792795
return null;

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 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.utils;
@@ -13,6 +13,7 @@
1313
import io.kubernetes.client.openapi.models.V1Deployment;
1414
import io.kubernetes.client.openapi.models.V1Ingress;
1515
import io.kubernetes.client.openapi.models.V1Job;
16+
import io.kubernetes.client.openapi.models.V1JobList;
1617
import io.kubernetes.client.openapi.models.V1PersistentVolume;
1718
import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;
1819
import io.kubernetes.client.openapi.models.V1ReplicaSet;
@@ -29,6 +30,7 @@
2930
import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
3031
import oracle.weblogic.kubernetes.logging.LoggingFacade;
3132

33+
import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.listJobs;
3234
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
3335
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
3436

@@ -210,13 +212,18 @@ public static Callable<Boolean> nothingFoundInNamespace(String namespace) {
210212

211213
// check if any jobs exist
212214
try {
213-
if (!Kubernetes.listJobs(namespace).getItems().isEmpty()) {
214-
logger.info("Jobs still exists!!!");
215-
List<V1Job> items = Kubernetes.listJobs(namespace).getItems();
216-
for (var item : items) {
217-
logger.info(item.getMetadata().getName());
215+
V1JobList jobList = listJobs(namespace);
216+
if (jobList != null) {
217+
List<V1Job> items = jobList.getItems();
218+
if (items != null && !items.isEmpty()) {
219+
logger.info("Jobs still exists!!!");
220+
for (var item : items) {
221+
if (item.getMetadata() != null) {
222+
logger.info(item.getMetadata().getName());
223+
}
224+
}
225+
nothingFound = false;
218226
}
219-
nothingFound = false;
220227
}
221228
} catch (Exception ex) {
222229
logger.warning(ex.getMessage());
@@ -456,8 +463,13 @@ public static void deleteNamespacedArtifacts(String namespace) {
456463

457464
// Delete jobs
458465
try {
459-
for (var item : Kubernetes.listJobs(namespace).getItems()) {
460-
Kubernetes.deleteJob(namespace, item.getMetadata().getName());
466+
V1JobList jobList = listJobs(namespace);
467+
if (jobList != null) {
468+
for (var item : jobList.getItems()) {
469+
if (item.getMetadata() != null) {
470+
Kubernetes.deleteJob(namespace, item.getMetadata().getName());
471+
}
472+
}
461473
}
462474
} catch (Exception ex) {
463475
logger.warning(ex.getMessage());

0 commit comments

Comments
 (0)