Skip to content

Commit 7a6b33e

Browse files
authored
Update Kubernetes Java Client on 3.4 branch for dependency updates (#3559)
* Update Kubernetes Java Client on 3.4 branch for dependency updates * Update additional dependencies to get latest SnakeYAML * Default to monitoring exporter 2.1.0
1 parent 69b613f commit 7a6b33e

File tree

16 files changed

+318
-76
lines changed

16 files changed

+318
-76
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# $ ./buildDockerImage.sh [-t <image-name>]
88
#
99
# -------------------------
10-
FROM ghcr.io/oracle/oraclelinux:8-slim AS jre-build
10+
FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
1111

12-
ENV JAVA_URL="https://download.java.net/java/GA/jdk18.0.2/f6ad4b4450fd4d298113270ec84f30ee/9/GPL/openjdk-18.0.2_linux-x64_bin.tar.gz"
12+
ENV JAVA_URL="https://download.java.net/java/GA/jdk19.0.1/afdd2e245b014143b62ccb916125e3ce/10/GPL/openjdk-19.0.1_linux-x64_bin.tar.gz"
1313

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

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pipeline {
212212
)
213213
string(name: 'MONITORING_EXPORTER_WEBAPP_VERSION',
214214
description: '',
215-
defaultValue: '2.0.7'
215+
defaultValue: '2.1.0'
216216
)
217217
booleanParam(name: 'COLLECT_LOGS_ON_SUCCESS',
218218
description: 'Collect logs for successful runs. Default is false.',

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.0.7",
727+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.0",
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.0.7 |
146+
| `image` | string | The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.0 |
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`. |

documentation/domains/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@
16451645
"type": "object",
16461646
"properties": {
16471647
"image": {
1648-
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.0.7",
1648+
"description": "The WebLogic Monitoring Exporter sidecar container image name. Defaults to ghcr.io/oracle/weblogic-monitoring-exporter:2.1.0",
16491649
"type": "string"
16501650
},
16511651
"imagePullPolicy": {

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

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

263263
//monitoring constants
264264
public static final String MONITORING_EXPORTER_WEBAPP_VERSION =
265-
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.0.7");
265+
getNonEmptySystemProperty("wko.it.monitoring.exporter.webapp.version", "2.1.0");
266266
public static final String MONITORING_EXPORTER_BRANCH =
267267
getNonEmptySystemProperty("wko.it.monitoring.exporter.branch", "main");
268268
public static final String PROMETHEUS_CHART_VERSION =

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/primitive/Kubernetes.java

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ public static boolean createDeployment(V1Deployment deployment) throws ApiExcept
314314
deployment, // V1Deployment | body of the V1Deployment containing deployment data
315315
PRETTY, // String | pretty print output.
316316
null, // String | dry run or permanent change
317-
null // String | field manager who is making the change
317+
null, // String | field manager who is making the change
318+
null // String | field validation
318319
);
319320
if (createdDeployment != null) {
320321
status = true;
@@ -463,7 +464,7 @@ public static String getPodLog(String name,
463464
public static V1Pod createPod(String namespace, V1Pod podBody) throws ApiException {
464465
V1Pod pod;
465466
try {
466-
pod = coreV1Api.createNamespacedPod(namespace, podBody, null, null, null);
467+
pod = coreV1Api.createNamespacedPod(namespace, podBody, null, null, null, null);
467468
} catch (ApiException apex) {
468469
getLogger().severe(apex.getResponseBody());
469470
throw apex;
@@ -832,7 +833,8 @@ public static boolean createNamespace(String name) throws ApiException {
832833
namespace, // name of the Namespace
833834
PRETTY, // pretty print output
834835
null, // indicates that modifications should not be persisted
835-
null // name associated with the actor or entity that is making these changes
836+
null, // name associated with the actor or entity that is making these changes
837+
null // field validation
836838
);
837839
} catch (ApiException apex) {
838840
getLogger().severe(apex.getResponseBody());
@@ -860,7 +862,8 @@ public static boolean createNamespace(String name, Map<String, String> labels) t
860862
namespace, // name of the Namespace
861863
PRETTY, // pretty print output
862864
null, // indicates that modifications should not be persisted
863-
null // name associated with the actor or entity that is making these changes
865+
null, // name associated with the actor or entity that is making these changes
866+
null // field validation
864867
);
865868
} catch (ApiException apex) {
866869
getLogger().severe(apex.getResponseBody());
@@ -889,7 +892,8 @@ public static boolean createNamespace(V1Namespace namespace) throws ApiException
889892
namespace, // V1Namespace configuration data object
890893
PRETTY, // pretty print output
891894
null, // indicates that modifications should not be persisted
892-
null // name associated with the actor or entity that is making these changes
895+
null, // name associated with the actor or entity that is making these changes
896+
null // field validation
893897
);
894898
} catch (ApiException apex) {
895899
getLogger().severe(apex.getResponseBody());
@@ -913,7 +917,8 @@ public static void replaceNamespace(V1Namespace ns) throws ApiException {
913917
ns, // V1Namespace object body
914918
PRETTY, // pretty print the output
915919
null, // dry run or changes need to be permanent
916-
null // field manager
920+
null, // field manager
921+
null // field validation
917922
);
918923
} catch (ApiException ex) {
919924
getLogger().severe(ex.getResponseBody());
@@ -1419,6 +1424,7 @@ public static boolean patchDeployment(String deploymentName, String namespace,
14191424
null,
14201425
null, // field-manager is optional
14211426
null,
1427+
null,
14221428
null),
14231429
patchFormat,
14241430
apiClient);
@@ -1493,7 +1499,8 @@ public static boolean createConfigMap(V1ConfigMap configMap) throws ApiException
14931499
configMap, // config map configuration data
14941500
PRETTY, // pretty print output
14951501
null, // indicates that modifications should not be persisted
1496-
null // name associated with the actor or entity that is making these changes
1502+
null, // name associated with the actor or entity that is making these changes
1503+
null // field validation
14971504
);
14981505
} catch (ApiException apex) {
14991506
getLogger().severe(apex.getResponseBody());
@@ -1538,7 +1545,8 @@ public static boolean replaceConfigMap(V1ConfigMap configMap) throws ApiExceptio
15381545
configMap, // config map configuration data
15391546
PRETTY, // pretty print output
15401547
null, // indicates that modifications should not be persisted
1541-
null // name associated with the actor or entity that is making these changes
1548+
null, // name associated with the actor or entity that is making these changes
1549+
null // field validation
15421550
);
15431551
assertNotNull(cm, "cm replace failed ");
15441552
} catch (ApiException apex) {
@@ -1639,7 +1647,8 @@ public static boolean createSecret(V1Secret secret) throws ApiException {
16391647
secret, // secret configuration data
16401648
PRETTY, // pretty print output
16411649
null, // indicates that modifications should not be persisted
1642-
null // fieldManager is a name associated with the actor
1650+
null, // fieldManager is a name associated with the actor
1651+
null // field validation
16431652
);
16441653
} catch (ApiException apex) {
16451654
getLogger().severe(apex.getResponseBody());
@@ -1743,7 +1752,8 @@ public static boolean createPv(V1PersistentVolume persistentVolume) throws ApiEx
17431752
persistentVolume, // persistent volume configuration data
17441753
PRETTY, // pretty print output
17451754
null, // indicates that modifications should not be persisted
1746-
null // fieldManager is a name associated with the actor
1755+
null, // fieldManager is a name associated with the actor
1756+
null // field validation
17471757
);
17481758
} catch (ApiException apex) {
17491759
getLogger().severe(apex.getResponseBody());
@@ -1786,7 +1796,8 @@ public static boolean createPvc(V1PersistentVolumeClaim persistentVolumeClaim) t
17861796
persistentVolumeClaim, // persistent volume claim configuration data
17871797
PRETTY, // pretty print output
17881798
null, // indicates that modifications should not be persisted
1789-
null // fieldManager is a name associated with the actor
1799+
null, // fieldManager is a name associated with the actor
1800+
null // field validation
17901801
);
17911802
} catch (ApiException apex) {
17921803
getLogger().severe(apex.getResponseBody());
@@ -1973,7 +1984,8 @@ public static V1ServiceAccount createServiceAccount(V1ServiceAccount serviceAcco
19731984
serviceAccount, // service account configuration data
19741985
PRETTY, // pretty print output
19751986
null, // indicates that modifications should not be persisted
1976-
null // fieldManager is a name associated with the actor
1987+
null, // fieldManager is a name associated with the actor
1988+
null // field validation
19771989
);
19781990
} catch (ApiException apex) {
19791991
getLogger().severe(apex.getResponseBody());
@@ -2061,7 +2073,8 @@ public static boolean createService(V1Service service) throws ApiException {
20612073
service, // service configuration data
20622074
PRETTY, // pretty print output
20632075
null, // indicates that modifications should not be persisted
2064-
null // fieldManager is a name associated with the actor
2076+
null, // fieldManager is a name associated with the actor
2077+
null // field validation
20652078
);
20662079
} catch (ApiException apex) {
20672080
getLogger().severe(apex.getResponseBody());
@@ -2213,7 +2226,8 @@ public static String createNamespacedJob(V1Job jobBody) throws ApiException {
22132226
jobBody, // V1Job | body of the V1Job containing job data
22142227
PRETTY, // String | pretty print output.
22152228
null, // String | dry run or permanent change
2216-
null // String | field manager who is making the change
2229+
null, // String | field manager who is making the change
2230+
null // field validation
22172231
);
22182232
if (createdJob != null) {
22192233
name = createdJob.getMetadata().getName();
@@ -2378,7 +2392,8 @@ public static boolean createClusterRole(V1ClusterRole clusterRole) throws ApiExc
23782392
clusterRole, // cluster role configuration data
23792393
PRETTY, // pretty print output
23802394
null, // indicates that modifications should not be persisted
2381-
null // fieldManager is a name associated with the actor
2395+
null, // fieldManager is a name associated with the actor
2396+
null // field validation
23822397
);
23832398
} catch (ApiException apex) {
23842399
getLogger().severe(apex.getResponseBody());
@@ -2402,7 +2417,8 @@ public static boolean createClusterRoleBinding(V1ClusterRoleBinding clusterRoleB
24022417
clusterRoleBinding, // role binding configuration data
24032418
PRETTY, // pretty print output
24042419
null, // indicates that modifications should not be persisted
2405-
null // fieldManager is a name associated with the actor
2420+
null, // fieldManager is a name associated with the actor
2421+
null // field validation
24062422
);
24072423
} catch (ApiException apex) {
24082424
getLogger().severe(apex.getResponseBody());
@@ -2427,7 +2443,8 @@ public static boolean createNamespacedRoleBinding(String namespace, V1RoleBindin
24272443
roleBinding, // role binding configuration data
24282444
PRETTY, // pretty print output
24292445
null, // indicates that modifications should not be persisted
2430-
null // fieldManager is a name associated with the actor
2446+
null, // fieldManager is a name associated with the actor
2447+
null // field validation
24312448
);
24322449
} catch (ApiException apex) {
24332450
getLogger().severe(apex.getResponseBody());
@@ -2899,7 +2916,8 @@ public static V1Ingress createIngress(String namespace, V1Ingress ingressBody)
28992916
ingressBody, // V1Ingress object, representing the ingress details
29002917
PRETTY, // pretty print output
29012918
null, // when present, indicates that modifications should not be persisted
2902-
null // a name associated with the actor or entity that is making these changes
2919+
null, // a name associated with the actor or entity that is making these changes
2920+
null // field validation
29032921
);
29042922
getLogger().info("Created ingress: {0}", Yaml.dump(ingress));
29052923
} catch (ApiException apex) {

0 commit comments

Comments
 (0)