From f112b8ab9e48cf0cb6682c8c19ce1c45d66904bf Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Mon, 30 Jun 2025 09:05:43 -0400 Subject: [PATCH 1/5] Prepare for next development iteration --- common/pom.xml | 2 +- domain-upgrader/pom.xml | 2 +- integration-tests/pom.xml | 2 +- json-schema-generator/pom.xml | 2 +- kubernetes/pom.xml | 2 +- operator-build-maven-plugin/pom.xml | 2 +- operator/pom.xml | 2 +- pom.xml | 2 +- swagger-generator/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index e7f1a281575..9e60d428e76 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT common diff --git a/domain-upgrader/pom.xml b/domain-upgrader/pom.xml index 3a3fe374901..657ba33383e 100644 --- a/domain-upgrader/pom.xml +++ b/domain-upgrader/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT domain-upgrader diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 181304821cb..724fd409255 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT integration-tests diff --git a/json-schema-generator/pom.xml b/json-schema-generator/pom.xml index bf2763f682b..0ade4bc8397 100644 --- a/json-schema-generator/pom.xml +++ b/json-schema-generator/pom.xml @@ -7,7 +7,7 @@ operator-parent oracle.kubernetes - 4.2.18 + 4.2.19-SNAPSHOT json-schema diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml index dfa20d8e0e2..02468ba7eba 100644 --- a/kubernetes/pom.xml +++ b/kubernetes/pom.xml @@ -9,7 +9,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT installation-tests diff --git a/operator-build-maven-plugin/pom.xml b/operator-build-maven-plugin/pom.xml index e6b6ef2b565..f99e87b9b42 100644 --- a/operator-build-maven-plugin/pom.xml +++ b/operator-build-maven-plugin/pom.xml @@ -7,7 +7,7 @@ operator-parent oracle.kubernetes - 4.2.18 + 4.2.19-SNAPSHOT operator-build-maven-plugin diff --git a/operator/pom.xml b/operator/pom.xml index 53e3314768b..35a827c7550 100644 --- a/operator/pom.xml +++ b/operator/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT weblogic-kubernetes-operator diff --git a/pom.xml b/pom.xml index 6c07a67da60..48c12315f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT operator diff --git a/swagger-generator/pom.xml b/swagger-generator/pom.xml index 8f9f4aec0ce..acef5ceccf6 100644 --- a/swagger-generator/pom.xml +++ b/swagger-generator/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.18 + 4.2.19-SNAPSHOT operator-swagger From 05129ccf608270b43989d18ff5560d18403503bc Mon Sep 17 00:00:00 2001 From: vanajakshi_mukkara Date: Mon, 30 Jun 2025 22:10:55 +0000 Subject: [PATCH 2/5] Owls126595 rel42 --- .../kubernetes/ItMiiDynamicUpdatePart2.java | 21 +++++++++++++++---- .../wdt-models/model.jdbc2.update2.yaml | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java index 96c4d92a2da..39a761edd17 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart2.java @@ -47,6 +47,7 @@ import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil; import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy; import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName; +import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime; import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -74,6 +75,8 @@ class ItMiiDynamicUpdatePart2 { public static Path pathToChangReadsYaml = null; static LoggingFacade logger = null; + static boolean isDataSourceCreated = false; + /** * Install Operator. * Create domain resource defintion. @@ -167,7 +170,7 @@ void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() { assertNotEquals(-1, adminServiceNodePort, "admin server default node port is not valid"); assertTrue(checkSystemResourceConfigViaAdminPod(helper.adminServerPodName, helper.domainNamespace, "JDBCSystemResources/TestDataSource2/JDBCResource/JDBCDriverParams", - "newdburl"), "JDBCSystemResource DB URL not found"); + "jdbc:oracle:thin:@host:1234:sid"), "JDBCSystemResource DB URL not found"); logger.info("JDBCSystemResource DB URL found"); // verify the application is undeployed @@ -179,6 +182,7 @@ void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() { // check that the domain status condition contains the correct type and expected reason logger.info("verifying the domain status condition contains the correct type and expected status"); helper.verifyDomainStatusConditionNoErrorMsg("Completed", "True"); + isDataSourceCreated = true; } /** @@ -197,9 +201,18 @@ void testMiiDeleteDatasource() { // This test uses the WebLogic domain created in BeforeAll method // BeforeEach method ensures that the server pods are running - LinkedHashMap pods = - helper.addDataSourceAndVerify(false); - + LinkedHashMap pods = new LinkedHashMap(); + if (!isDataSourceCreated) { + pods = helper.addDataSourceAndVerify(false); + } else { + // get the creation time of the admin server pod before patching + pods.put(helper.adminServerPodName, getPodCreationTime(helper.domainNamespace, helper.adminServerPodName)); + // get the creation time of the managed server pods before patching + for (int i = 1; i <= helper.replicaCount; i++) { + pods.put(helper.managedServerPrefix + i, + getPodCreationTime(helper.domainNamespace, helper.managedServerPrefix + i)); + } + } // write sparse yaml to delete datasource to file Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml"); String yamlToDeleteDS = "resources:\n" diff --git a/integration-tests/src/test/resources/wdt-models/model.jdbc2.update2.yaml b/integration-tests/src/test/resources/wdt-models/model.jdbc2.update2.yaml index ab47b03d2f7..8192f80e580 100644 --- a/integration-tests/src/test/resources/wdt-models/model.jdbc2.update2.yaml +++ b/integration-tests/src/test/resources/wdt-models/model.jdbc2.update2.yaml @@ -14,7 +14,7 @@ resources: RowPrefetchSize: 200 JNDIName: jdbc/TestDataSource2 JDBCDriverParams: - URL: 'newdburl' + URL: 'jdbc:oracle:thin:@host:1234:sid' PasswordEncrypted: '@@SECRET:@@ENV:DOMAIN_UID@@-db-secret:password@@' DriverName: oracle.jdbc.OracleDriver Properties: From 937b591b0b42b7c2037fc0a0d1dde39a1a1d2892 Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Tue, 1 Jul 2025 10:07:27 -0400 Subject: [PATCH 3/5] Use WME 2.3.3 --- documentation/domains/Domain.json | 4 ++-- documentation/domains/Domain.md | 2 +- kubernetes/crd/domain-crd.yaml | 6 +++--- .../oracle/kubernetes/operator/KubernetesConstants.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/domains/Domain.json b/documentation/domains/Domain.json index f58f63abd0f..31e05a627d9 100644 --- a/documentation/domains/Domain.json +++ b/documentation/domains/Domain.json @@ -891,8 +891,8 @@ "type": "object", "properties": { "image": { - "default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2", - "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2", + "default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3", + "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3", "type": "string" }, "imagePullPolicy": { diff --git a/documentation/domains/Domain.md b/documentation/domains/Domain.md index 5a4720f0d8d..82435a32b31 100644 --- a/documentation/domains/Domain.md +++ b/documentation/domains/Domain.md @@ -145,7 +145,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall | Name | Type | Description | | --- | --- | --- | | `configuration` | Map | The configuration for the WebLogic Monitoring Exporter. If WebLogic Server instances are already running and have the monitoring exporter sidecar container, then changes to this field will be propagated to the exporter without requiring the restart of the WebLogic Server instances. | -| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2 | +| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3 | | `imagePullPolicy` | string | The image pull policy for the WebLogic Monitoring Exporter sidecar container image. Legal values are Always, Never, and IfNotPresent. Defaults to Always if image ends in :latest; IfNotPresent, otherwise. | | `port` | integer | The port exposed by the WebLogic Monitoring Exporter running in the sidecar container. Defaults to 8080. The port value must not conflict with a port used by any WebLogic Server instance, including the ports of built-in channels or network access points (NAPs). | | `resources` | [Resource Requirements](k8s1.28.2.md#resource-requirements) | Memory and CPU minimum requirements and limits for the Monitoring exporter sidecar. See `kubectl explain pods.spec.containers.resources`. | diff --git a/kubernetes/crd/domain-crd.yaml b/kubernetes/crd/domain-crd.yaml index 8a9e0ee8d66..05787bfacb6 100644 --- a/kubernetes/crd/domain-crd.yaml +++ b/kubernetes/crd/domain-crd.yaml @@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - weblogic.sha256: b793961c174a30db8c360bc83cf40e214d5458ec61a963d6756c4fa38e0af449 + weblogic.sha256: b9f89cd5c4bda8320b782801a450f45bc429f16dc09e7ef17f9821e244768ce3 name: domains.weblogic.oracle spec: group: weblogic.oracle @@ -47,9 +47,9 @@ spec: appropriate. See https://github.com/oracle/weblogic-monitoring-exporter. properties: image: - default: ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2 + default: ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3 description: The WebLogic Monitoring Exporter sidecar container - image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2 + image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3 type: string imagePullPolicy: description: The image pull policy for the WebLogic Monitoring diff --git a/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java b/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java index 274af80e4b1..03c418f9c70 100644 --- a/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java +++ b/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java @@ -8,7 +8,7 @@ /** Kubernetes constants. */ public interface KubernetesConstants { String DEFAULT_IMAGE = "container-registry.oracle.com/middleware/weblogic:12.2.1.4"; - String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.2"; + String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.3.3"; String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2"; String EXPORTER_CONTAINER_NAME = "monitoring-exporter"; String LATEST_IMAGE_SUFFIX = ":latest"; From ddd2a2a6c1b6dfa1ae9580b4f641656c17795cf1 Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Tue, 1 Jul 2025 10:16:30 -0400 Subject: [PATCH 4/5] Dependency updates --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 48c12315f7c..1b8f45eac2c 100644 --- a/pom.xml +++ b/pom.xml @@ -708,7 +708,7 @@ 3.8.1 3.6.0 3.5.1 - 10.26.0 + 10.26.1 1.0 3.6.0 3.2.7 @@ -718,7 +718,7 @@ 2.0.1 1.0.39 1.9.0 - 1.5.7 + 1.5.8 1.5.0 1.18.0 1.7.3 @@ -734,7 +734,7 @@ 3.0.1u2 2.2.0 4.12.0 - 3.13.0 + 3.14.0 1.81 5.13.2 5.7.1 @@ -755,7 +755,7 @@ 1.5.18 4.31.1 2.5.2 - 10.3 + 10.3.1 ${project.basedir}/src-generated-swagger ${root-generated-swagger}/main/java ${project.basedir}/swagger/domain.json From 8320146d2ff094bf63e7f775dd84b37b4a6288c7 Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Tue, 1 Jul 2025 11:24:40 -0400 Subject: [PATCH 5/5] Release WKO 4.2.19 --- common/pom.xml | 2 +- domain-upgrader/pom.xml | 2 +- integration-tests/pom.xml | 2 +- json-schema-generator/pom.xml | 2 +- kubernetes/pom.xml | 2 +- operator-build-maven-plugin/pom.xml | 2 +- operator/pom.xml | 2 +- pom.xml | 2 +- swagger-generator/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 9e60d428e76..92303cd6054 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 common diff --git a/domain-upgrader/pom.xml b/domain-upgrader/pom.xml index 657ba33383e..cab4072488c 100644 --- a/domain-upgrader/pom.xml +++ b/domain-upgrader/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 domain-upgrader diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 724fd409255..b158f35ad86 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 integration-tests diff --git a/json-schema-generator/pom.xml b/json-schema-generator/pom.xml index 0ade4bc8397..ce713faf393 100644 --- a/json-schema-generator/pom.xml +++ b/json-schema-generator/pom.xml @@ -7,7 +7,7 @@ operator-parent oracle.kubernetes - 4.2.19-SNAPSHOT + 4.2.19 json-schema diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml index 02468ba7eba..94e73636991 100644 --- a/kubernetes/pom.xml +++ b/kubernetes/pom.xml @@ -9,7 +9,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 installation-tests diff --git a/operator-build-maven-plugin/pom.xml b/operator-build-maven-plugin/pom.xml index f99e87b9b42..d1d6ba984e6 100644 --- a/operator-build-maven-plugin/pom.xml +++ b/operator-build-maven-plugin/pom.xml @@ -7,7 +7,7 @@ operator-parent oracle.kubernetes - 4.2.19-SNAPSHOT + 4.2.19 operator-build-maven-plugin diff --git a/operator/pom.xml b/operator/pom.xml index 35a827c7550..7e39e9670e6 100644 --- a/operator/pom.xml +++ b/operator/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 weblogic-kubernetes-operator diff --git a/pom.xml b/pom.xml index 1b8f45eac2c..1a6e18109bc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 operator diff --git a/swagger-generator/pom.xml b/swagger-generator/pom.xml index acef5ceccf6..9095503f9b0 100644 --- a/swagger-generator/pom.xml +++ b/swagger-generator/pom.xml @@ -7,7 +7,7 @@ oracle.kubernetes operator-parent - 4.2.19-SNAPSHOT + 4.2.19 operator-swagger