fix

Netflix · Nov 4, 2024 · e806756 · e806756
1 parent cb77b0b
commit e806756
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/metaflow/plugins/argo/argo_workflows.py b/metaflow/plugins/argo/argo_workflows.py
@@ -3483,8 +3483,8 @@ def ephemeral_volume_claims(self, claims=None):
                     "ephemeral": {
                         "volumeClaimTemplate": {
                             "spec": {
-                                **values.get("spec", {}),
                                 **VOLUME_CLAIM_TEMPLATE_DEFAULTS,
+                                **values.get("spec", {}),
                             },
                         }
                     },

diff --git a/metaflow/plugins/kubernetes/kubernetes.py b/metaflow/plugins/kubernetes/kubernetes.py
@@ -67,11 +67,6 @@
     "{METAFLOW_PARALLEL_STEP_CLI_OPTIONS_TEMPLATE}"
 )
 
-VOLUME_CLAIM_TEMPLATE_DEFAULTS = {
-    "accessModes": ["ReadWriteOnce"],
-    "resources": {"requests": {"storage": "1Gi"}},
-}
-
 
 class KubernetesException(MetaflowException):
     headline = "Kubernetes error"

diff --git a/metaflow/plugins/kubernetes/kubernetes_job.py b/metaflow/plugins/kubernetes/kubernetes_job.py
@@ -281,8 +281,8 @@ def create_job_spec(self):
                                 ephemeral=client.V1EphemeralVolumeSource(
                                     volume_claim_template=client.V1PersistentVolumeClaimTemplate(
                                         spec={
-                                            **vals.get("spec", {}),
                                             **VOLUME_CLAIM_TEMPLATE_DEFAULTS,
+                                            **vals.get("spec", {}),
                                         },
                                     )
                                 ),

diff --git a/metaflow/plugins/kubernetes/kubernetes_jobsets.py b/metaflow/plugins/kubernetes/kubernetes_jobsets.py
@@ -779,8 +779,8 @@ def dump(self):
                                             ephemeral=client.V1EphemeralVolumeSource(
                                                 volume_claim_template=client.V1PersistentVolumeClaimTemplate(
                                                     spec={
-                                                        **vals.get("spec", {}),
                                                         **VOLUME_CLAIM_TEMPLATE_DEFAULTS,
+                                                        **vals.get("spec", {}),
                                                     },
                                                 )
                                             ),