From 3d0ef93252bde408e45b0abc168fce592ee54605 Mon Sep 17 00:00:00 2001 From: Ryan Eberhard Date: Tue, 30 Jan 2024 14:19:17 -0500 Subject: [PATCH] Use WME 2.1.9 --- documentation/domains/Domain.json | 2 +- documentation/domains/Domain.md | 2 +- kubernetes/crd/domain-crd.yaml | 4 ++-- .../java/oracle/kubernetes/operator/KubernetesConstants.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/domains/Domain.json b/documentation/domains/Domain.json index a9ed3114dac..5b47ea2a023 100644 --- a/documentation/domains/Domain.json +++ b/documentation/domains/Domain.json @@ -724,7 +724,7 @@ "type": "object", "properties": { "image": { - "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.8", + "description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9", "type": "string" }, "imagePullPolicy": { diff --git a/documentation/domains/Domain.md b/documentation/domains/Domain.md index f0dd60c8457..fc12e00c1a0 100644 --- a/documentation/domains/Domain.md +++ b/documentation/domains/Domain.md @@ -143,7 +143,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.1.8 | +| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9 | | `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` | number | 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.13.5.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 460c6c0cf6b..ac4681ed5d1 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: 9400fe5d76d156397fafc65dbe20c5084bcdbf81ad497921cc3bff436cb448f7 + weblogic.sha256: d97dd6c770c9a9821cb9caa538a6e9e283ff40c645adbe232dbe1ee64c7c1672 name: domains.weblogic.oracle spec: group: weblogic.oracle @@ -39,7 +39,7 @@ spec: properties: image: description: The WebLogic Monitoring Exporter sidecar container - image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.8 + image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9 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 4d30ddc958e..e364051d577 100644 --- a/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java +++ b/operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java @@ -1,4 +1,4 @@ -// Copyright (c) 2017, 2023, Oracle and/or its affiliates. +// Copyright (c) 2017, 2024, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.kubernetes.operator; @@ -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.1.8"; + String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.9"; String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.16.1-debian-elasticsearch7-1.2"; String EXPORTER_CONTAINER_NAME = "monitoring-exporter"; String ALWAYS_IMAGEPULLPOLICY = ImagePullPolicy.Always.name();