Use Kubernetes Java Client 21.0.1-legacy

Author: rjeberhard

documentation/domains/Domain.json

@@ -977,7 +977,7 @@
         },
         "resources": {
           "description": "Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements.",
-          "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.28.2/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+          "$ref": "#/definitions/V1VolumeResourceRequirements"
         }
       }
     },
@@ -1300,6 +1300,20 @@
         }
       }
     },
+    "V1VolumeResourceRequirements": {
+      "description": "VolumeResourceRequirements describes the storage resource requirements for a volume.",
+      "type": "object",
+      "properties": {
+        "requests": {
+          "description": "Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/",
+          "$ref": "#/definitions/Map"
+        },
+        "limits": {
+          "description": "Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/",
+          "$ref": "#/definitions/Map"
+        }
+      }
+    },
     "WDTTimeouts": {
       "type": "object",
       "properties": {

documentation/domains/Domain.md

@@ -395,7 +395,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `resources` | [Resource Requirements](k8s1.28.2.md#resource-requirements) | Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements. |
+| `resources` | [V 1 Volume Resource Requirements](#v-1-volume-resource-requirements) | Resources represents the minimum resources the volume should have. More info https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources. ResourceRequirements describes the compute resource requirements. |
 | `storageClassName` | string | StorageClassName is the name of StorageClass to which this persistent volume belongs. Empty value means that this volume does not belong to any StorageClass. |
 | `volumeName` | string | VolumeName is the binding reference to the PersistentVolume backing this claim. |
 
@@ -410,4 +410,13 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | `setServerGroupsTimeoutMillis` | integer | WDT set server groups timeout for extending a JRF domain configured cluster in milliseconds. Default: 180000. |
 | `startApplicationTimeoutMillis` | integer | WDT application start timeout in milliseconds. Default: 180000. |
 | `stopApplicationTimeoutMillis` | integer | WDT application stop timeout in milliseconds. Default: 180000. |
-| `undeployTimeoutMillis` | integer | WDT application or library undeployment timeout in milliseconds. Default: 180000. |
+| `undeployTimeoutMillis` | integer | WDT application or library undeployment timeout in milliseconds. Default: 180000. |
+
+### V 1 Volume Resource Requirements
+
+VolumeResourceRequirements describes the storage resource requirements for a volume.
+
+| Name | Type | Description |
+| --- | --- | --- |
+| `limits` | Map | Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
+| `requests` | Map | Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |

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

@@ -12,6 +12,7 @@
 
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.RbacV1Subject;
 import io.kubernetes.client.openapi.models.V1ClusterRole;
 import io.kubernetes.client.openapi.models.V1ClusterRoleBinding;
 import io.kubernetes.client.openapi.models.V1LocalObjectReference;
@@ -20,7 +21,6 @@
 import io.kubernetes.client.openapi.models.V1PolicyRule;
 import io.kubernetes.client.openapi.models.V1RoleBinding;
 import io.kubernetes.client.openapi.models.V1RoleRef;
-import io.kubernetes.client.openapi.models.V1Subject;
 import oracle.weblogic.domain.DomainList;
 import oracle.weblogic.domain.DomainResource;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
@@ -952,7 +952,7 @@ private static boolean createRbacApiObjectsForWLDFScript(String domainNamespace,
           .apiVersion(RBAC_API_VERSION)
           .metadata(new V1ObjectMeta()
               .name(clusterRoleBindingName))
-          .addSubjectsItem(new V1Subject()
+          .addSubjectsItem(new RbacV1Subject()
               .kind("ServiceAccount")
               .name("default")
               .namespace(domainNamespace)
@@ -979,7 +979,7 @@ private static boolean createRbacApiObjectsForWLDFScript(String domainNamespace,
           .metadata(new V1ObjectMeta()
               .name(roleBindingName)
               .namespace(opNamespace))
-          .addSubjectsItem(new V1Subject()
+          .addSubjectsItem(new RbacV1Subject()
               .kind("ServiceAccount")
               .name("default")
               .namespace(domainNamespace)

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

@@ -1293,7 +1293,8 @@ public static boolean createDomainCustomResource(DomainResource domain, String..
           json, // JSON schema of the Resource to create
           null, // pretty print output
           null, // dry run
-          null // field manager
+          null, // field manager
+          null // field validation
       );
     } catch (ApiException apex) {
       getLogger().severe(apex.getResponseBody());
@@ -1544,7 +1545,8 @@ public static boolean createClusterCustomResource(ClusterResource cluster, Strin
           json, // JSON schema of the Resource to create
           null, // pretty print output
           null, // dry run
-          null // field manager
+          null, // field manager
+          null // field validation
       );
     } catch (ApiException apex) {
       getLogger().severe(apex.getResponseBody());

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonLBTestUtils.java

@@ -34,9 +34,9 @@
 import io.kubernetes.client.openapi.models.V1PersistentVolumeSpec;
 import io.kubernetes.client.openapi.models.V1PodSpec;
 import io.kubernetes.client.openapi.models.V1PodTemplateSpec;
-import io.kubernetes.client.openapi.models.V1ResourceRequirements;
 import io.kubernetes.client.openapi.models.V1Volume;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
+import io.kubernetes.client.openapi.models.V1VolumeResourceRequirements;
 import oracle.weblogic.domain.AdminServer;
 import oracle.weblogic.domain.AdminService;
 import oracle.weblogic.domain.Channel;
@@ -163,7 +163,7 @@ public static List<String> createMultipleDomainsSharingPVUsingWlstAndVerify(Stri
         .spec(new V1PersistentVolumeClaimSpec()
             .addAccessModesItem("ReadWriteMany")
             .volumeName(sharingPvName)
-            .resources(new V1ResourceRequirements()
+            .resources(new V1VolumeResourceRequirements()
                 .putRequestsItem("storage", Quantity.fromString("6Gi"))))
         .metadata(new V1ObjectMetaBuilder()
             .withName(sharingPvcName)

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java

@@ -18,6 +18,7 @@
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.RbacV1Subject;
 import io.kubernetes.client.openapi.models.V1ClusterRole;
 import io.kubernetes.client.openapi.models.V1ClusterRoleBinding;
 import io.kubernetes.client.openapi.models.V1Container;
@@ -54,7 +55,6 @@
 import io.kubernetes.client.openapi.models.V1ServicePort;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import io.kubernetes.client.openapi.models.V1StorageClass;
-import io.kubernetes.client.openapi.models.V1Subject;
 import io.kubernetes.client.openapi.models.V1Volume;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
 import io.kubernetes.client.util.Yaml;
@@ -1206,7 +1206,7 @@ private static void createHostPathProvisionerObjects(String namespace, String ho
         .metadata(new V1ObjectMeta()
             .name(name))
         .subjects(Arrays.asList(
-            new V1Subject()
+            new RbacV1Subject()
                 .kind("ServiceAccount")
                 .name(name)
                 .namespace(namespace)))
@@ -1247,7 +1247,7 @@ private static void createHostPathProvisionerObjects(String namespace, String ho
             .name("leader-locking-hostpath-provisioner")
             .namespace(namespace))
         .subjects(Arrays.asList(
-            new V1Subject()
+            new RbacV1Subject()
                 .kind("ServiceAccount")
                 .name(name)
                 .namespace(namespace)))

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/PersistentVolumeUtils.java

@@ -1,7 +1,6 @@
 // Copyright (c) 2021, 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.weblogic.kubernetes.utils;
 
 import java.io.IOException;
@@ -27,9 +26,9 @@
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimSpec;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeSpec;
 import io.kubernetes.client.openapi.models.V1Pod;
-import io.kubernetes.client.openapi.models.V1ResourceRequirements;
 import io.kubernetes.client.openapi.models.V1SecurityContext;
 import io.kubernetes.client.openapi.models.V1VolumeMount;
+import io.kubernetes.client.openapi.models.V1VolumeResourceRequirements;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -307,7 +306,7 @@ public static void createPVC(String pvName, String pvcName, String domainUid,
         .spec(new V1PersistentVolumeClaimSpec()
             .addAccessModesItem("ReadWriteMany")
             .volumeName(pvName)
-            .resources(new V1ResourceRequirements()
+            .resources(new V1VolumeResourceRequirements()
                 .putRequestsItem("storage", Quantity.fromString("5Gi"))))
         .metadata(new V1ObjectMeta()
             .name(pvcName)
@@ -439,7 +438,7 @@ public static void createPvAndPvc(String nameSuffix, String namespace,
         .spec(new V1PersistentVolumeClaimSpec()
             .addAccessModesItem("ReadWriteMany")
             .volumeName("pv-test" + nameSuffix)
-            .resources(new V1ResourceRequirements()
+            .resources(new V1VolumeResourceRequirements()
                 .putRequestsItem("storage", Quantity.fromString("10Gi"))))
         .metadata(new V1ObjectMeta()
             .name("pvc-" + nameSuffix)