- *
{@literal
- * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
- * --namespace ns-ipqy
- * --reuse-values
- * --set "domainNamespaces={ns-xghr,ns-idir}"
- * }
- *
- *
- */
- @Order(14)
- @ParameterizedTest
- @ValueSource(booleans = { true, false })
- void testK8SEventsStartStopWatchingNS(boolean enableClusterRoleBinding) {
- logger.info("testing testK8SEventsStartStopWatchingNS with enableClusterRoleBinding={0}",
- enableClusterRoleBinding);
- OffsetDateTime timestamp = now();
-
- logger.info("Adding a new domain namespace in the operator watch list");
- List- *
{@literal
- * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
- * --namespace ns-ipqy
- * --reuse-values
- * --set "domainNamespaceSelectionStrategy=LabelSelector"
- * --set "domainNamespaceLabelSelector=weblogic-operator\=enabled"
- * }
- *
- *
- */
- @Order(15)
- @ParameterizedTest
- @ValueSource(booleans = { true, false })
- void testK8SEventsStartStopWatchingNSWithLabelSelector(boolean enableClusterRoleBinding) {
- logger.info("testing testK8SEventsStartStopWatchingNSWithLabelSelector with enableClusterRoleBinding={0}",
- enableClusterRoleBinding);
- OffsetDateTime timestamp = now();
-
- logger.info("Labeling namespace {0} to enable it in the operator watch list", domainNamespace3);
- // label domainNamespace3
- new Command()
- .withParams(new CommandParams()
- .command("kubectl label ns " + domainNamespace3 + " weblogic-operator=enabled --overwrite"))
- .execute();
-
- // Helm upgrade parameters
- opParams = opParams
- .domainNamespaceSelectionStrategy("LabelSelector")
- .domainNamespaceLabelSelector("weblogic-operator=enabled")
- .enableClusterRoleBinding(enableClusterRoleBinding);
- upgradeAndVerifyOperator(opNamespace, opParams);
-
- logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", domainNamespace3);
- checkEvent(opNamespace, domainNamespace3, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
-
- // verify there is no event logged in domainNamespace4
- logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
- assertFalse(domainEventExists(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED,
- "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
- + domainNamespace4 + ", expected no such event will be logged");
-
- timestamp = now();
- logger.info("Labelling namespace {0} to \"weblogic-operator=disabled\" to disable it in the operator "
- + "watch list", domainNamespace3);
-
- // label domainNamespace3 to weblogic-operator=disabled
- new Command()
- .withParams(new CommandParams()
- .command("kubectl label ns " + domainNamespace3 + " weblogic-operator=disabled --overwrite"))
- .execute();
-
- logger.info("verify NamespaceWatchingStopped event is logged in namespace {0}", domainNamespace3);
- checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace3, null, "Normal", timestamp,
- enableClusterRoleBinding);
-
- if (enableClusterRoleBinding) {
- String newNSWithoutLabels = "ns-newnamespace1";
- String newNSWithLabels = "ns-newnamespace2";
-
- assertDoesNotThrow(() -> createNamespaces(newNSWithoutLabels, newNSWithLabels),
- "Failed to create new namespaces");
-
- new Command()
- .withParams(new CommandParams()
- .command("kubectl label ns " + newNSWithLabels + " weblogic-operator=enabled --overwrite"))
- .execute();
-
- logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", newNSWithLabels);
- checkEvent(opNamespace, newNSWithLabels, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
-
- // verify there is no event logged in domainNamespace4
- logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
- assertFalse(domainEventExists(opNamespace, newNSWithoutLabels, null, NAMESPACE_WATCHING_STARTED,
- "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
- + newNSWithoutLabels + ", expected no such event will be logged");
- }
- }
-
- private void createNamespaces(String newNSWithoutLabels, String newNSWithLabels) throws ApiException {
- createNamespace(newNSWithoutLabels);
- createNamespace(newNSWithLabels);
- }
-
- /**
- * Test verifies the operator logs a NamespaceWatchingStarted event in the respective domain namespace
- * when it starts watching a new domain namespace with domainNamespaceSelectionStrategy set to RegExp and
- * operator logs a NamespaceWatchingStopped event in the respective domain namespace
- * when it stops watching a domain namespace.
- * If set to RegExp, then the operator will manage the set of namespaces discovered by a list of namespaces
- * using the value specified by domainNamespaceRegExp as a regular expression matched against the namespace names.
- * The test upgrades the operator instance through helm to add or remove another domain namespace
- * in the operator watch list.
- *- *
{@literal
- * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
- * --namespace ns-ipqy
- * --reuse-values
- * --set "domainNamespaceSelectionStrategy=RegExp"
- * --set "domainNamespaceRegExp=abcd"
- * }
- *
- *
- */
- @Order(16)
- @ParameterizedTest
- @ValueSource(booleans = { true, false })
- void testK8SEventsStartStopWatchingNSWithRegExp(boolean enableClusterRoleBinding) {
- OffsetDateTime timestamp = now();
- logger.info("Adding a new domain namespace {0} in the operator watch list", domainNamespace5);
- // Helm upgrade parameters
- opParams = opParams
- .domainNamespaceSelectionStrategy("RegExp")
- .domainNamespaceRegExp(domainNamespace5.substring(3))
- .enableClusterRoleBinding(enableClusterRoleBinding);
-
- upgradeAndVerifyOperator(opNamespace, opParams);
-
- logger.info("verify NamespaceWatchingStarted event is logged in {0}", domainNamespace5);
- checkEvent(opNamespace, domainNamespace5, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
-
- // verify there is no event logged in domainNamespace4
- logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
- assertFalse(domainEventExists(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED,
- "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
- + domainNamespace4 + ", expected no such event will be logged");
-
- timestamp = now();
- logger.info("Setting the domainNamesoaceRegExp to a new value {0}", domainNamespace4.substring(3));
-
- // Helm upgrade parameters
- opParams = opParams
- .domainNamespaceSelectionStrategy("RegExp")
- .domainNamespaceRegExp(domainNamespace4.substring(3));
-
- upgradeAndVerifyOperator(opNamespace, opParams);
-
- logger.info("verify NamespaceWatchingStopped event is logged in namespace {0}", domainNamespace5);
- checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace5, null, "Normal", timestamp,
- enableClusterRoleBinding);
-
- logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", domainNamespace4);
- checkEvent(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
- }
-
- /**
- * Operator helm parameter domainNamespaceSelectionStrategy is set to Dedicated.
- * If set to Dedicated, then operator will manage WebLogic Domains only in the same namespace which the operator
- * itself is deployed, which is the namespace of the Helm release.
- * Operator logs a NamespaceWatchingStopped in the operator domain namespace and
- * NamespaceWatchingStopped event in the other domain namespaces when it stops watching a domain namespace.
- *
- * Test verifies NamespaceWatchingStopped event is logged when operator stops watching a domain namespace.
- */
- @Order(17)
- @Test
- void testK8SEventsStartStopWatchingNSWithDedicated() {
- OffsetDateTime timestamp = now();
-
- // Helm upgrade parameters
- opParams = opParams.domainNamespaceSelectionStrategy("Dedicated")
- .enableClusterRoleBinding(false);
-
- upgradeAndVerifyOperator(opNamespace, opParams);
-
- logger.info("verify NamespaceWatchingStarted event is logged in {0}", opNamespace);
- checkEvent(opNamespace, opNamespace, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
-
- logger.info("verify NamespaceWatchingStopped event is logged in {0}", domainNamespace4);
- checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace4, null, "Normal", timestamp, false);
+ checkEvent(opNamespace, domainNamespace2, domainUid, DOMAIN_DELETED, "Normal", timestamp);
}
/**
@@ -956,8 +669,9 @@ void testK8SEventsStartStopWatchingNSWithDedicated() {
@AfterAll
public static void tearDown() {
if (!SKIP_CLEANUP) {
- deletePersistentVolumeClaim(domainNamespace1, "sample-pvc");
+ deletePersistentVolumeClaim(domainNamespace3, "sample-pvc");
deletePersistentVolume("sample-pv");
+ shutdownDomain(domainUid, domainNamespace3);
}
}
@@ -1004,20 +718,43 @@ private static void checkEventWithCount(
}
// Create and start a WebLogic domain in PV
- private void createDomain() {
+ private static void createDomain(String domainNamespace, String domainUid, String pvName, String pvcName) {
+
+ assertDoesNotThrow(() -> createDomain(domainNamespace, domainUid, pvName, pvcName,
+ "IF_NEEDED"),
+ "Failed to create domain custom resource");
+
+ // verify the admin server service created
+ checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
+
+ // verify managed server services created
+ for (int i = 1; i <= replicaCount; i++) {
+ logger.info("Checking managed server service/pod {0} is created in namespace {1}",
+ managedServerPodNamePrefix + i, domainNamespace);
+ checkPodReadyAndServiceExists(managedServerPodNamePrefix + i, domainUid, domainNamespace);
+ }
+ }
+
+ // Create and start a WebLogic domain in PV
+ private static Domain createDomain(String domainNamespace, String domainUid,
+ String pvName, String pvcName, String serverStartupPolicy) {
+
+ // create pull secrets for WebLogic image when running in non Kind Kubernetes cluster
+ // this secret is used only for non-kind cluster
+ createSecretForBaseImages(domainNamespace);
// create WebLogic domain credential secret
- createSecretWithUsernamePassword(wlSecretName, domainNamespace1,
+ createSecretWithUsernamePassword(wlSecretName, domainNamespace,
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
// create persistent volume and persistent volume claim for domain
// these resources should be labeled with domainUid for cleanup after testing
- createPV(pvName, domainUid, this.getClass().getSimpleName());
- createPVC(pvName, pvcName, domainUid, domainNamespace1);
-
+ createPV(pvName, domainUid, className);
+ createPVC(pvName, pvcName, domainUid, domainNamespace);
+ int t3ChannelPort = getNextFreePort();
// create a temporary WebLogic domain property file
File domainPropertiesFile = assertDoesNotThrow(()
- -> File.createTempFile("domain", "properties"),
+ -> File.createTempFile("domain", "properties"),
"Failed to create domain properties file");
Properties p = new Properties();
p.setProperty("domain_path", "/shared/domains");
@@ -1029,13 +766,13 @@ private void createDomain() {
p.setProperty("admin_username", ADMIN_USERNAME_DEFAULT);
p.setProperty("admin_password", ADMIN_PASSWORD_DEFAULT);
p.setProperty("admin_t3_public_address", K8S_NODEPORT_HOST);
- p.setProperty("admin_t3_channel_port", Integer.toString(32000));
+ p.setProperty("admin_t3_channel_port", Integer.toString(t3ChannelPort));
p.setProperty("number_of_ms", "2");
p.setProperty("managed_server_name_base", managedServerNameBase);
p.setProperty("domain_logs", "/shared/logs");
p.setProperty("production_mode_enabled", "true");
assertDoesNotThrow(()
- -> p.store(new FileOutputStream(domainPropertiesFile), "domain properties file"),
+ -> p.store(new FileOutputStream(domainPropertiesFile), "domain properties file"),
"Failed to write domain properties file");
// WLST script for creating domain
@@ -1043,7 +780,7 @@ private void createDomain() {
// create configmap and domain on persistent volume using the WLST script and property file
createDomainOnPVUsingWlst(wlstScript, domainPropertiesFile.toPath(),
- pvName, pvcName, domainNamespace1);
+ pvName, pvcName, domainNamespace);
// create a domain custom resource configuration object
logger.info("Creating domain custom resource");
@@ -1052,7 +789,7 @@ private void createDomain() {
.kind("Domain")
.metadata(new V1ObjectMeta()
.name(domainUid)
- .namespace(domainNamespace1))
+ .namespace(domainNamespace))
.spec(new DomainSpec()
.domainUid(domainUid)
.domainHome("/shared/domains/" + domainUid) // point to domain home in pv
@@ -1064,12 +801,12 @@ private void createDomain() {
.name(BASE_IMAGES_REPO_SECRET))) // this secret is used only in non-kind cluster
.webLogicCredentialsSecret(new V1SecretReference()
.name(wlSecretName)
- .namespace(domainNamespace1))
+ .namespace(domainNamespace))
.includeServerOutInPodLog(true)
.logHomeEnabled(Boolean.TRUE)
.logHome("/shared/logs/" + domainUid)
.dataHome("")
- .serverStartPolicy("IF_NEEDED")
+ .serverStartPolicy(serverStartupPolicy)
.serverPod(new ServerPod() //serverpod
.addEnvItem(new V1EnvVar()
.name("USER_MEM_ARGS")
@@ -1092,33 +829,23 @@ private void createDomain() {
.replicas(replicaCount)
.serverStartState("RUNNING")));
setPodAntiAffinity(domain);
-
// verify the domain custom resource is created
- createDomainAndVerify(domain, domainNamespace1);
-
- // verify the admin server service created
- checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace1);
-
- // verify managed server services created
- for (int i = 1; i <= replicaCount; i++) {
- logger.info("Checking managed server service/pod {0} is created in namespace {1}",
- managedServerPodNamePrefix + i, domainNamespace1);
- checkPodReadyAndServiceExists(managedServerPodNamePrefix + i, domainUid, domainNamespace1);
- }
+ createDomainAndVerify(domain, domainNamespace);
+ return domain;
}
/**
* Create a WebLogic domain on a persistent volume by doing the following. Create a configmap containing WLST script
* and property file. Create a Kubernetes job to create domain on persistent volume.
*
- * @param wlstScriptFile python script to create domain
+ * @param wlstScriptFile python script to create domain
* @param domainPropertiesFile properties file containing domain configuration
- * @param pvName name of the persistent volume to create domain in
- * @param pvcName name of the persistent volume claim
- * @param namespace name of the domain namespace in which the job is created
+ * @param pvName name of the persistent volume to create domain in
+ * @param pvcName name of the persistent volume claim
+ * @param namespace name of the domain namespace in which the job is created
*/
- private void createDomainOnPVUsingWlst(Path wlstScriptFile, Path domainPropertiesFile,
- String pvName, String pvcName, String namespace) {
+ private static void createDomainOnPVUsingWlst(Path wlstScriptFile, Path domainPropertiesFile,
+ String pvName, String pvcName, String namespace) {
logger.info("Preparing to run create domain job using WLST");
List+ *
{@literal
+ * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
+ * --namespace ns-ipqy
+ * --reuse-values
+ * --set "domainNamespaces={ns-xghr,ns-idir}"
+ * }
+ *
+ *
+ */
+ @ParameterizedTest
+ @ValueSource(booleans = { true, false })
+ void testK8SEventsStartStopWatchingNS(boolean enableClusterRoleBinding) {
+ logger.info("testing testK8SEventsStartStopWatchingNS with enableClusterRoleBinding={0}",
+ enableClusterRoleBinding);
+ OffsetDateTime timestamp = now();
+
+ logger.info("Adding a new domain namespace in the operator watch list");
+ List+ *
{@literal
+ * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
+ * --namespace ns-ipqy
+ * --reuse-values
+ * --set "domainNamespaceSelectionStrategy=LabelSelector"
+ * --set "domainNamespaceLabelSelector=weblogic-operator\=enabled"
+ * }
+ *
+ *
+ */
+ @ParameterizedTest
+ @ValueSource(booleans = { true, false })
+ void testK8SEventsStartStopWatchingNSWithLabelSelector(boolean enableClusterRoleBinding) {
+ logger.info("testing testK8SEventsStartStopWatchingNSWithLabelSelector with enableClusterRoleBinding={0}",
+ enableClusterRoleBinding);
+ OffsetDateTime timestamp = now();
+
+ logger.info("Labeling namespace {0} to enable it in the operator watch list", domainNamespace3);
+ // label domainNamespace3
+ Command
+ .withParams(new CommandParams()
+ .command("kubectl label ns " + domainNamespace3 + " weblogic-operator=enabled --overwrite"))
+ .execute();
+ OperatorParams opTestParams = opParamsOriginal;
+ // Helm upgrade parameters
+ opTestParams = opTestParams
+ .domainNamespaceSelectionStrategy("LabelSelector")
+ .domainNamespaceLabelSelector("weblogic-operator=enabled")
+ .enableClusterRoleBinding(enableClusterRoleBinding);
+ upgradeAndVerifyOperator(opNamespace, opTestParams);
+
+ logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", domainNamespace3);
+ checkEvent(opNamespace, domainNamespace3, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
+
+ // verify there is no event logged in domainNamespace4
+ logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
+ assertFalse(domainEventExists(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED,
+ "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
+ + domainNamespace4 + ", expected no such event will be logged");
+
+ timestamp = now();
+ logger.info("Labelling namespace {0} to \"weblogic-operator=disabled\" to disable it in the operator "
+ + "watch list", domainNamespace3);
+
+ // label domainNamespace3 to weblogic-operator=disabled
+ Command
+ .withParams(new CommandParams()
+ .command("kubectl label ns " + domainNamespace3 + " weblogic-operator=disabled --overwrite"))
+ .execute();
+
+ logger.info("verify NamespaceWatchingStopped event is logged in namespace {0}", domainNamespace3);
+ checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace3, null, "Normal", timestamp,
+ enableClusterRoleBinding);
+
+ if (enableClusterRoleBinding) {
+ String newNSWithoutLabels = "ns-newnamespace1";
+ String newNSWithLabels = "ns-newnamespace2";
+
+ assertDoesNotThrow(() -> createNamespaces(newNSWithoutLabels, newNSWithLabels),
+ "Failed to create new namespaces");
+
+ Command
+ .withParams(new CommandParams()
+ .command("kubectl label ns " + newNSWithLabels + " weblogic-operator=enabled --overwrite"))
+ .execute();
+
+ logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", newNSWithLabels);
+ checkEvent(opNamespace, newNSWithLabels, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
+
+ // verify there is no event logged in domainNamespace4
+ logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
+ assertFalse(domainEventExists(opNamespace, newNSWithoutLabels, null, NAMESPACE_WATCHING_STARTED,
+ "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
+ + newNSWithoutLabels + ", expected no such event will be logged");
+ }
+ }
+
+ private void createNamespaces(String newNSWithoutLabels, String newNSWithLabels) throws ApiException {
+ createNamespace(newNSWithoutLabels);
+ createNamespace(newNSWithLabels);
+ }
+
+ /**
+ * Test verifies the operator logs a NamespaceWatchingStarted event in the respective domain namespace
+ * when it starts watching a new domain namespace with domainNamespaceSelectionStrategy set to RegExp and
+ * operator logs a NamespaceWatchingStopped event in the respective domain namespace
+ * when it stops watching a domain namespace.
+ * If set to RegExp, then the operator will manage the set of namespaces discovered by a list of namespaces
+ * using the value specified by domainNamespaceRegExp as a regular expression matched against the namespace names.
+ * The test upgrades the operator instance through helm to add or remove another domain namespace
+ * in the operator watch list.
+ *+ *
{@literal
+ * helm upgrade weblogic-operator kubernetes/charts/weblogic-operator
+ * --namespace ns-ipqy
+ * --reuse-values
+ * --set "domainNamespaceSelectionStrategy=RegExp"
+ * --set "domainNamespaceRegExp=abcd"
+ * }
+ *
+ *
+ */
+ @ParameterizedTest
+ @ValueSource(booleans = { true, false })
+ void testK8SEventsStartStopWatchingNSWithRegExp(boolean enableClusterRoleBinding) {
+ OffsetDateTime timestamp = now();
+ logger.info("Adding a new domain namespace {0} in the operator watch list", domainNamespace5);
+ // Helm upgrade parameters
+ OperatorParams opTestParams = opParamsOriginal;
+ opTestParams = opTestParams
+ .domainNamespaceSelectionStrategy("RegExp")
+ .domainNamespaceRegExp(domainNamespace5.substring(3))
+ .enableClusterRoleBinding(enableClusterRoleBinding);
+
+ upgradeAndVerifyOperator(opNamespace, opTestParams);
+
+ logger.info("verify NamespaceWatchingStarted event is logged in {0}", domainNamespace5);
+ checkEvent(opNamespace, domainNamespace5, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
+
+ // verify there is no event logged in domainNamespace4
+ logger.info("verify NamespaceWatchingStarted event is not logged in {0}", domainNamespace4);
+ assertFalse(domainEventExists(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED,
+ "Normal", timestamp), "domain event " + NAMESPACE_WATCHING_STARTED + " is logged in "
+ + domainNamespace4 + ", expected no such event will be logged");
+
+ timestamp = now();
+ logger.info("Setting the domainNamesoaceRegExp to a new value {0}", domainNamespace4.substring(3));
+
+ // Helm upgrade parameters
+ opTestParams = opTestParams
+ .domainNamespaceSelectionStrategy("RegExp")
+ .domainNamespaceRegExp(domainNamespace4.substring(3));
+
+ upgradeAndVerifyOperator(opNamespace, opTestParams);
+
+ logger.info("verify NamespaceWatchingStopped event is logged in namespace {0}", domainNamespace5);
+ checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace5, null, "Normal", timestamp,
+ enableClusterRoleBinding);
+
+ logger.info("verify NamespaceWatchingStarted event is logged in namespace {0}", domainNamespace4);
+ checkEvent(opNamespace, domainNamespace4, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
+ }
+
+ /**
+ * Operator helm parameter domainNamespaceSelectionStrategy is set to Dedicated.
+ * If set to Dedicated, then operator will manage WebLogic Domains only in the same namespace which the operator
+ * itself is deployed, which is the namespace of the Helm release.
+ * Operator logs a NamespaceWatchingStopped in the operator domain namespace and
+ * NamespaceWatchingStopped event in the other domain namespaces when it stops watching a domain namespace.
+ *
+ * Test verifies NamespaceWatchingStopped event is logged when operator stops watching a domain namespace.
+ */
+ @Test
+ void testK8SEventsStartStopWatchingNSWithDedicated() {
+ OffsetDateTime timestamp = now();
+
+ // Helm upgrade parameters
+ OperatorParams opTestParams = opParamsOriginal;
+ opTestParams = opTestParams.domainNamespaceSelectionStrategy("Dedicated")
+ .enableClusterRoleBinding(false);
+
+ upgradeAndVerifyOperator(opNamespace, opTestParams);
+
+ logger.info("verify NamespaceWatchingStarted event is logged in {0}", opNamespace);
+ checkEvent(opNamespace, opNamespace, null, NAMESPACE_WATCHING_STARTED, "Normal", timestamp);
+
+ logger.info("verify NamespaceWatchingStopped event is logged in {0}", domainNamespace4);
+ checkNamespaceWatchingStoppedEvent(opNamespace, domainNamespace4, null, "Normal", timestamp, false);
+ }
+
+ // Utility method to check event
+ private static void checkEvent(
+ String opNamespace, String domainNamespace, String domainUid,
+ String reason, String type, OffsetDateTime timestamp) {
+ testUntil(withLongRetryPolicy,
+ checkDomainEvent(opNamespace, domainNamespace, domainUid, reason, type, timestamp),
+ logger,
+ "domain event {0} to be logged in namespace {1}",
+ reason,
+ domainNamespace);
+ }
+
+ private static void checkNamespaceWatchingStoppedEvent(
+ String opNamespace, String domainNamespace, String domainUid,
+ String type, OffsetDateTime timestamp, boolean enableClusterRoleBinding) {
+ testUntil(
+ checkDomainEventWatchingStopped(
+ opNamespace, domainNamespace, domainUid, type, timestamp, enableClusterRoleBinding),
+ logger,
+ "domain event NamespaceWatchingStopped to be logged in namespace {0}",
+ domainNamespace);
+ }
+}
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java
index 7af91172d32..7d72f3b232c 100644
--- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java
+++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java
@@ -203,6 +203,21 @@ public static oracle.weblogic.domain.Domain getDomainCustomResource(String domai
return Domain.getDomainCustomResource(domainUid, namespace);
}
+ /**
+ * Get the Domain Custom Resource.
+ *
+ * @param domainUid unique domain identifier
+ * @param namespace name of namespace
+ * @param domainVersion version of domain
+ * @return Domain Custom Resource or null if Domain does not exist
+ * @throws ApiException if Kubernetes client API call fails
+ */
+ public static oracle.weblogic.domain.Domain getDomainCustomResource(String domainUid,
+ String namespace,
+ String domainVersion) throws ApiException {
+ return Domain.getDomainCustomResource(domainUid, namespace, domainVersion);
+ }
+
/**
* Shutdown the domain.
*
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java
index 3ae76f5fb87..ea0422fdea7 100644
--- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java
+++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Domain.java
@@ -165,6 +165,21 @@ public static oracle.weblogic.domain.Domain getDomainCustomResource(String domai
return Kubernetes.getDomainCustomResource(domainUid, namespace);
}
+ /**
+ * Get a Domain Custom Resource.
+ *
+ * @param domainUid unique domain identifier
+ * @param namespace name of namespace
+ * @param domainVersion domain version
+ * @return domain custom resource or null if Domain does not exist
+ * @throws ApiException if Kubernetes request fails
+ */
+ public static oracle.weblogic.domain.Domain getDomainCustomResource(String domainUid,
+ String namespace,
+ String domainVersion) throws ApiException {
+ return Kubernetes.getDomainCustomResource(domainUid, namespace, domainVersion);
+ }
+
/**
* Patch the Domain Custom Resource.
*
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java
index 847451ef0ec..8459a0711b2 100644
--- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java
+++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java
@@ -1265,6 +1265,39 @@ public static Domain getDomainCustomResource(String domainUid, String namespace)
return null;
}
+ /**
+ * Get the Domain Custom Resource.
+ *
+ * @param domainUid unique domain identifier
+ * @param namespace name of namespace
+ * @param domainVersion version of domain
+ * @return domain custom resource or null if Domain does not exist
+ * @throws ApiException if Kubernetes request fails
+ */
+ public static Domain getDomainCustomResource(String domainUid, String namespace, String domainVersion)
+ throws ApiException {
+ Object domain;
+ try {
+ domain = customObjectsApi.getNamespacedCustomObject(
+ DOMAIN_GROUP, // custom resource's group name
+ domainVersion, // //custom resource's version
+ namespace, // custom resource's namespace
+ DOMAIN_PLURAL, // custom resource's plural name
+ domainUid // custom object's name
+ );
+ } catch (ApiException apex) {
+ getLogger().severe(apex.getResponseBody());
+ throw apex;
+ }
+
+ if (domain != null) {
+ return handleResponse(domain, Domain.class);
+ }
+
+ getLogger().warning("Domain Custom Resource '" + domainUid + "' not found in namespace " + namespace);
+ return null;
+ }
+
/**
* Patch the Domain Custom Resource using JSON Patch.JSON Patch is a format for describing changes to a JSON document
* using a series of operations. JSON Patch is specified in RFC 6902 from the IETF. For example, the following
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java
index 18b2021f421..aedf2d83748 100644
--- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java
+++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DomainUtils.java
@@ -45,6 +45,7 @@
import oracle.weblogic.domain.Cluster;
import oracle.weblogic.domain.Configuration;
import oracle.weblogic.domain.Domain;
+import oracle.weblogic.domain.DomainCondition;
import oracle.weblogic.domain.DomainSpec;
import oracle.weblogic.domain.Model;
import oracle.weblogic.domain.ServerPod;
@@ -80,6 +81,7 @@
import static oracle.weblogic.kubernetes.actions.TestActions.createConfigMap;
import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
import static oracle.weblogic.kubernetes.actions.TestActions.deleteDomainCustomResource;
+import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
import static oracle.weblogic.kubernetes.actions.TestActions.getJob;
import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
import static oracle.weblogic.kubernetes.actions.TestActions.listPods;
@@ -749,4 +751,68 @@ public static void shutdownDomainAndVerify(String domainNamespace, String domain
}
}
+ /**
+ * Check the domain status condition type does not exist.
+ * @param domainUid uid of the domain
+ * @param domainNamespace namespace of the domain
+ * @param conditionType the type name of condition, accepted value: Completed, Available, Failed and
+ * ConfigChangesPendingRestart
+ * @return true if the condition type does not exist, false otherwise
+ */
+ public static boolean verifyDomainStatusConditionTypeDoesNotExist(String domainUid,
+ String domainNamespace,
+ String conditionType) {
+ return verifyDomainStatusConditionTypeDoesNotExist(domainUid, domainNamespace,
+ conditionType, DOMAIN_VERSION);
+ }
+
+ /**
+ * Check the domain status condition type does not exist.
+ * @param domainUid uid of the domain
+ * @param domainNamespace namespace of the domain
+ * @param conditionType the type name of condition, accepted value: Completed, Available, Failed and
+ * ConfigChangesPendingRestart
+ * @param domainVersion version of domain
+ * @return true if the condition type does not exist, false otherwise
+ */
+ public static boolean verifyDomainStatusConditionTypeDoesNotExist(String domainUid,
+ String domainNamespace,
+ String conditionType,
+ String domainVersion) {
+ Domain domain = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace,
+ domainVersion));
+
+ if (domain != null && domain.getStatus() != null) {
+ List