This is an automated email from the ASF dual-hosted git repository. saadurrahman pushed a commit to branch saadurrahman/3821-Remove-Deprecated-Volumes-K8s-dev in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit 2c0512e4ffb49e992f835bfefb82cf2b7916a840 Author: Saad Ur Rahman <[email protected]> AuthorDate: Tue May 3 10:33:17 2022 -0400 [K8s] using Volume Factory to generate PVC. --- .../heron/scheduler/kubernetes/V1Controller.java | 39 ++-------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java index 7812ed6aae9..9c93e30cf84 100644 --- a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java +++ b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java @@ -64,7 +64,6 @@ import io.kubernetes.client.openapi.models.V1LabelSelector; import io.kubernetes.client.openapi.models.V1ObjectFieldSelector; import io.kubernetes.client.openapi.models.V1ObjectMeta; import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim; -import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimBuilder; import io.kubernetes.client.openapi.models.V1PodSpec; import io.kubernetes.client.openapi.models.V1PodTemplate; import io.kubernetes.client.openapi.models.V1PodTemplateSpec; @@ -1120,41 +1119,9 @@ public class V1Controller extends KubernetesController { continue; } - V1PersistentVolumeClaim claim = new V1PersistentVolumeClaimBuilder() - .withNewMetadata() - .withName(pvc.getKey()) - .withLabels(getPersistentVolumeClaimLabels(getTopologyName())) - .endMetadata() - .withNewSpec() - .withStorageClassName("") - .endSpec() - .build(); - - // Populate PVC options. - for (Map.Entry<KubernetesConstants.VolumeConfigKeys, String> option - : pvc.getValue().entrySet()) { - String optionValue = option.getValue(); - switch(option.getKey()) { - case storageClassName: - claim.getSpec().setStorageClassName(optionValue); - break; - case sizeLimit: - claim.getSpec().setResources( - new V1ResourceRequirements() - .putRequestsItem("storage", new Quantity(optionValue))); - break; - case accessModes: - claim.getSpec().setAccessModes(Arrays.asList(optionValue.split(","))); - break; - case volumeMode: - claim.getSpec().setVolumeMode(optionValue); - break; - // Valid ignored options not used in a PVC. - default: - break; - } - } - listOfPVCs.add(claim); + listOfPVCs.add(Volumes.get() + .createPersistentVolumeClaim(pvc.getKey(), + getPersistentVolumeClaimLabels(getTopologyName()), pvc.getValue())); } return listOfPVCs; }
