Skip to content

Commit 5476ac3

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/main' into release/4.0
2 parents 97ecc72 + f02eb30 commit 5476ac3

File tree

9 files changed

+17
-33
lines changed

9 files changed

+17
-33
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# -------------------------
1010
FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
1111

12-
ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
13-
ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-aarch64_bin.tar.gz"
12+
ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz"
13+
ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-aarch64_bin.tar.gz"
1414

1515
RUN set -eux; \
1616
microdnf -y install gzip tar; \

‎Jenkinsfile.oke‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ pipeline {
135135
)
136136
string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
137137
description: '',
138-
defaultValue: '2.1.2'
138+
defaultValue: '2.1.3'
139139
)
140140
string(name: 'PROMETHEUS_CHART_VERSION',
141141
description: '',

‎buildAndPushImage.sh‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,8 @@ echo "Building image '$name' ..."
6767

6868
# BUILD AND PUSH THE IMAGE (replace all environment variables)
6969
BUILD_START=$(date '+%s')
70-
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/amd64 --tag $name-amd64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
71-
echo "There was an error building the amd64 image."
72-
exit 1
73-
}
74-
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-amd64 || {
75-
echo "There was an error pushing the amd64 image."
76-
exit 1
77-
}
78-
${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/arm64 --tag $name-arm64v8 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
79-
echo "There was an error building the arm64v8 image."
80-
exit 1
81-
}
82-
${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-arm64v8 || {
83-
echo "There was an error pushing the arm64v8 image."
84-
exit 1
85-
}
86-
${WLSIMG_BUILDER:-docker} manifest create $PROXY_SETTINGS $name --amend $name-amd64 --amend $name-arm64v8 || {
87-
echo "There was an error building the manifest."
88-
exit 1
89-
}
90-
${WLSIMG_BUILDER:-docker} manifest push $PROXY_SETTINGS $name || {
91-
echo "There was an error pushing the manifest."
70+
${WLSIMG_BUILDER:-docker} buildx build $PROXY_SETTINGS --pull --push --platform linux/amd64,linux/arm64 --tag $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
71+
echo "There was an error building and pushing the image."
9272
exit 1
9373
}
9474
BUILD_END=$(date '+%s')

‎documentation/domains/Domain.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@
688688
"type": "object",
689689
"properties": {
690690
"image": {
691-
"default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2",
692-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2",
691+
"default": "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3",
692+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3",
693693
"type": "string"
694694
},
695695
"imagePullPolicy": {

‎documentation/domains/Domain.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
126126
| Name | Type | Description |
127127
| --- | --- | --- |
128128
| `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. |
129-
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2 |
129+
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3 |
130130
| `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. |
131131
| `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). |
132132
| `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
@@ -280,7 +280,7 @@ public interface TestConstants {
280280

281281
//monitoring constants
282282
public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
283-
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.2");
283+
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.3");
284284
public static final String MONITORING_EXPORTER_BRANCH =
285285
getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
286286
public static final String PROMETHEUS_CHART_VERSION =

‎kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ spec:
3434
{{- end }}
3535
spec:
3636
serviceAccountName: {{ .serviceAccount | quote }}
37+
{{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
3738
securityContext:
3839
seccompProfile:
3940
type: RuntimeDefault
41+
{{- end }}
4042
{{- with .nodeSelector }}
4143
nodeSelector:
4244
{{- toYaml . | nindent 8 }}
@@ -262,9 +264,11 @@ spec:
262264
{{- end }}
263265
spec:
264266
serviceAccountName: {{ .serviceAccount | quote }}
267+
{{- if (ne ( .kubernetesPlatform | default "Generic" ) "OpenShift") }}
265268
securityContext:
266269
seccompProfile:
267270
type: RuntimeDefault
271+
{{- end }}
268272
{{- with .nodeSelector }}
269273
nodeSelector:
270274
{{- toYaml . | nindent 12 }}

‎kubernetes/crd/domain-crd.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: fb02cf4d6a86bc94f3091999e95f502e66c540631d48b7c505b190fe8f134847
8+
weblogic.sha256: f9d602e9832c79cc4b9ae676c4681e3c6ccd0301a76f8f46a5d2e6cea7c9bf4d
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -47,9 +47,9 @@ spec:
4747
appropriate. See https://github.com/oracle/weblogic-monitoring-exporter.
4848
properties:
4949
image:
50-
default: ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2
50+
default: ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3
5151
description: The WebLogic Monitoring Exporter sidecar container
52-
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.2
52+
image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3
5353
type: string
5454
imagePullPolicy:
5555
description: The image pull policy for the WebLogic Monitoring

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.2";
11+
String DEFAULT_EXPORTER_IMAGE = "ghcr.io/oracle/weblogic-monitoring-exporter:2.1.3";
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 LATEST_IMAGE_SUFFIX = ":latest";

0 commit comments

Comments
 (0)