Skip to content

Commit d1ff0cf

Browse files
committed
Use WME 2.1.2
1 parent 41d35a7 commit d1ff0cf

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

documentation/domains/Domain.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@
724724
"type": "object",
725725
"properties": {
726726
"image": {
727-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.1",
727+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2",
728728
"type": "string"
729729
},
730730
"imagePullPolicy": {

documentation/domains/Domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
143143
| Name | Type | Description |
144144
| --- | --- | --- |
145145
| `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. |
146-
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.1 |
146+
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2 |
147147
| `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. |
148148
| `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). |
149149
| `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`. |

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public interface TestConstants {
267267

268268
//monitoring constants
269269
public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
270-
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.1");
270+
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.2");
271271
public static final String MONITORING_EXPORTER_BRANCH =
272272
getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
273273
public static final String PROMETHEUS_CHART_VERSION =

kubernetes/crd/domain-crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2023, 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
apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: f260ed89c3a2a357c339b88fee0f998eb456d31bfd50164cea3cb62b3b63fd8a
8+
weblogic.sha256: 4dfb830a302482285fe29a87207158aff738d88caa7ee6ccb9c780f415adb21c
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -39,7 +39,7 @@ spec:
3939
properties:
4040
image:
4141
description: The WebLogic Monitoring Exporter sidecar container
42-
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.1
42+
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2
4343
type: string
4444
imagePullPolicy:
4545
description: The image pull policy for the WebLogic Monitoring

operator/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2017, 2023, 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.kubernetes.operator;
@@ -8,7 +8,7 @@
88
/** Kubernetes constants. */
99
public interface KubernetesConstants {
1010
String DEFAULT_IMAGE = "container-registry.oracle.com/middleware/weblogic:12.2.1.4";
11-
String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.1";
11+
String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2";
1212
String DEFAULT_FLUENTD_IMAGE = "fluent/fluentd-kubernetes-daemonset:v1.14.5-debian-elasticsearch7-1.1";
1313
String EXPORTER_CONTAINER_NAME = "monitoring-exporter";
1414
String ALWAYS_IMAGEPULLPOLICY = ImagePullPolicy.Always.name();

operator/src/main/java/oracle/kubernetes/operator/helpers/CrdHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2018, 2023, 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.kubernetes.operator.helpers;
@@ -101,7 +101,7 @@ private static URI asFileURI(String fileName) throws URISyntaxException {
101101
static void writeAsYaml(URI outputFileName, Object model) {
102102
try (Writer writer = Files.newBufferedWriter(uriToPath.apply(outputFileName))) {
103103
writer.write(
104-
"# Copyright (c) 2020, 2021, Oracle and/or its affiliates.\n"
104+
"# Copyright (c) 2020, 2023, Oracle and/or its affiliates.\n"
105105
+ "# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.\n");
106106
writer.write("\n");
107107
dumpYaml(writer, model);

0 commit comments

Comments
 (0)