dagster-k8s 0.26.18rc2__py3-none-any.whl → 0.26.19__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of dagster-k8s might be problematic. Click here for more details.
- dagster_k8s/executor.py +4 -0
- dagster_k8s/launcher.py +4 -0
- dagster_k8s/ops/k8s_job_op.py +8 -0
- dagster_k8s/utils.py +14 -0
- dagster_k8s/version.py +1 -1
- {dagster_k8s-0.26.18rc2.dist-info → dagster_k8s-0.26.19.dist-info}/METADATA +2 -2
- {dagster_k8s-0.26.18rc2.dist-info → dagster_k8s-0.26.19.dist-info}/RECORD +10 -10
- {dagster_k8s-0.26.18rc2.dist-info → dagster_k8s-0.26.19.dist-info}/WHEEL +0 -0
- {dagster_k8s-0.26.18rc2.dist-info → dagster_k8s-0.26.19.dist-info}/licenses/LICENSE +0 -0
- {dagster_k8s-0.26.18rc2.dist-info → dagster_k8s-0.26.19.dist-info}/top_level.txt +0 -0
dagster_k8s/executor.py
CHANGED
|
@@ -37,6 +37,7 @@ from dagster_k8s.job import (
|
|
|
37
37
|
get_user_defined_k8s_config,
|
|
38
38
|
)
|
|
39
39
|
from dagster_k8s.launcher import K8sRunLauncher
|
|
40
|
+
from dagster_k8s.utils import get_deployment_id_label
|
|
40
41
|
|
|
41
42
|
_K8S_EXECUTOR_CONFIG_SCHEMA = merge_dicts(
|
|
42
43
|
DagsterK8sJobConfig.config_type_job(),
|
|
@@ -297,6 +298,9 @@ class K8sStepHandler(StepHandler):
|
|
|
297
298
|
labels["dagster/code-location"] = (
|
|
298
299
|
run.remote_job_origin.repository_origin.code_location_origin.location_name
|
|
299
300
|
)
|
|
301
|
+
deployment_name_env_var = get_deployment_id_label(container_context.run_k8s_config)
|
|
302
|
+
if deployment_name_env_var:
|
|
303
|
+
labels["dagster/deployment-name"] = deployment_name_env_var
|
|
300
304
|
job = construct_dagster_k8s_job(
|
|
301
305
|
job_config=job_config,
|
|
302
306
|
args=args,
|
dagster_k8s/launcher.py
CHANGED
|
@@ -18,6 +18,7 @@ from dagster._utils.error import serializable_error_info_from_exc_info
|
|
|
18
18
|
from dagster_k8s.client import DagsterKubernetesClient
|
|
19
19
|
from dagster_k8s.container_context import K8sContainerContext
|
|
20
20
|
from dagster_k8s.job import DagsterK8sJobConfig, construct_dagster_k8s_job, get_job_name_from_run_id
|
|
21
|
+
from dagster_k8s.utils import get_deployment_id_label
|
|
21
22
|
|
|
22
23
|
|
|
23
24
|
class K8sRunLauncher(RunLauncher, ConfigurableClass):
|
|
@@ -231,6 +232,9 @@ class K8sRunLauncher(RunLauncher, ConfigurableClass):
|
|
|
231
232
|
"dagster/job": job_origin.job_name,
|
|
232
233
|
"dagster/run-id": run.run_id,
|
|
233
234
|
}
|
|
235
|
+
deployment_name_env_var = get_deployment_id_label(user_defined_k8s_config)
|
|
236
|
+
if deployment_name_env_var:
|
|
237
|
+
labels["dagster/deployment-name"] = deployment_name_env_var
|
|
234
238
|
if run.remote_job_origin:
|
|
235
239
|
labels["dagster/code-location"] = (
|
|
236
240
|
run.remote_job_origin.repository_origin.code_location_origin.location_name
|
dagster_k8s/ops/k8s_job_op.py
CHANGED
|
@@ -313,6 +313,14 @@ def execute_k8s_job(
|
|
|
313
313
|
labels["dagster/code-location"] = (
|
|
314
314
|
context.dagster_run.remote_job_origin.repository_origin.code_location_origin.location_name
|
|
315
315
|
)
|
|
316
|
+
env = user_defined_k8s_config.container_config.get("env")
|
|
317
|
+
deployment_name_env_var = (
|
|
318
|
+
next((entry for entry in env if entry["name"] == "DAGSTER_CLOUD_DEPLOYMENT_NAME"), None)
|
|
319
|
+
if env
|
|
320
|
+
else None
|
|
321
|
+
)
|
|
322
|
+
if deployment_name_env_var:
|
|
323
|
+
labels["dagster/deployment-name"] = deployment_name_env_var["value"]
|
|
316
324
|
|
|
317
325
|
job = construct_dagster_k8s_job(
|
|
318
326
|
job_config=k8s_job_config,
|
dagster_k8s/utils.py
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import re
|
|
2
|
+
from typing import TYPE_CHECKING
|
|
2
3
|
|
|
3
4
|
from dagster import __version__ as dagster_version
|
|
4
5
|
|
|
6
|
+
if TYPE_CHECKING:
|
|
7
|
+
from dagster_k8s.job import UserDefinedDagsterK8sConfig
|
|
8
|
+
|
|
5
9
|
|
|
6
10
|
def sanitize_k8s_label(label_name: str):
|
|
7
11
|
# Truncate too long label values to fit into 63-characters limit and avoid invalid characters.
|
|
@@ -18,3 +22,13 @@ def get_common_labels():
|
|
|
18
22
|
"app.kubernetes.io/version": sanitize_k8s_label(dagster_version),
|
|
19
23
|
"app.kubernetes.io/part-of": "dagster",
|
|
20
24
|
}
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def get_deployment_id_label(user_defined_k8s_config: "UserDefinedDagsterK8sConfig"):
|
|
28
|
+
env = user_defined_k8s_config.container_config.get("env")
|
|
29
|
+
deployment_name_env_var = (
|
|
30
|
+
next((entry for entry in env if entry["name"] == "DAGSTER_CLOUD_DEPLOYMENT_NAME"), None)
|
|
31
|
+
if env
|
|
32
|
+
else None
|
|
33
|
+
)
|
|
34
|
+
return deployment_name_env_var["value"] if deployment_name_env_var else None
|
dagster_k8s/version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
__version__ = "0.26.
|
|
1
|
+
__version__ = "0.26.19"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: dagster-k8s
|
|
3
|
-
Version: 0.26.
|
|
3
|
+
Version: 0.26.19
|
|
4
4
|
Summary: A Dagster integration for k8s
|
|
5
5
|
Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-k8s
|
|
6
6
|
Author: Dagster Labs
|
|
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: Apache Software License
|
|
|
14
14
|
Classifier: Operating System :: OS Independent
|
|
15
15
|
Requires-Python: >=3.9,<3.13
|
|
16
16
|
License-File: LICENSE
|
|
17
|
-
Requires-Dist: dagster==1.10.
|
|
17
|
+
Requires-Dist: dagster==1.10.19
|
|
18
18
|
Requires-Dist: kubernetes<33
|
|
19
19
|
Requires-Dist: google-auth!=2.23.1
|
|
20
20
|
Dynamic: author
|
|
@@ -2,20 +2,20 @@ dagster_k8s/__init__.py,sha256=1Vi9HXEW9fatVuNzWTr6Oq-JEHmyDrVkonZuELsQ1C0,751
|
|
|
2
2
|
dagster_k8s/client.py,sha256=-Ns2saJri4Xxu-OpQ_T93e2K6aVnZvU19tj0iaMmTg8,40901
|
|
3
3
|
dagster_k8s/component.py,sha256=-66T-IHktXQ8FC0INNPFWsrxpoBsEEtRAiDuhWxCTKk,1999
|
|
4
4
|
dagster_k8s/container_context.py,sha256=399bdqmV3Ce6lNbfuxnhdyJSCy9keRRPJfVjDGn2U4I,22642
|
|
5
|
-
dagster_k8s/executor.py,sha256=
|
|
5
|
+
dagster_k8s/executor.py,sha256=hRwzohUFfusEc84Iz9Q7N7NN5lHoCyODdARh-kpU9ec,15126
|
|
6
6
|
dagster_k8s/job.py,sha256=v7RXYLZHzy2sTC7HYdz_INqbLWyZxUz9QIMwORArjJg,43065
|
|
7
7
|
dagster_k8s/kubernetes_version.py,sha256=T7MDA5pOOVE_woRUkKWxtiRj4RCLAVfjSn6ZXUr6sAA,38
|
|
8
|
-
dagster_k8s/launcher.py,sha256=
|
|
8
|
+
dagster_k8s/launcher.py,sha256=iNvrxhF7DP0sNxydg3hU9OzVGILYUcgL9LxeXGtaXqI,16936
|
|
9
9
|
dagster_k8s/models.py,sha256=REKzAY103pZw0pQFqvHaM6lL02hgbi0rxmm71qds4W8,6338
|
|
10
10
|
dagster_k8s/pipes.py,sha256=kb1So6erUgjTDkicALpU1T5mG9xa9n8aeI4lPUVeU2o,34031
|
|
11
11
|
dagster_k8s/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
|
|
12
12
|
dagster_k8s/test.py,sha256=cNtcbzxytiZtd01wY5ip7KPi01y0BUQuQhohoIfAFUM,684
|
|
13
|
-
dagster_k8s/utils.py,sha256=
|
|
14
|
-
dagster_k8s/version.py,sha256=
|
|
13
|
+
dagster_k8s/utils.py,sha256=NS9HRyy67-jF6n4loEPd6xuU33t7Y27IovK92WCdgu0,1296
|
|
14
|
+
dagster_k8s/version.py,sha256=hFTnREFUNV6k-r7gNk8pbgoXT_sSxa-pE2ccr7Zysn4,24
|
|
15
15
|
dagster_k8s/ops/__init__.py,sha256=ur-9GrE_DRfnsFCpYan03qOY9cWbjagC8KHZFZuiCmc,113
|
|
16
|
-
dagster_k8s/ops/k8s_job_op.py,sha256=
|
|
17
|
-
dagster_k8s-0.26.
|
|
18
|
-
dagster_k8s-0.26.
|
|
19
|
-
dagster_k8s-0.26.
|
|
20
|
-
dagster_k8s-0.26.
|
|
21
|
-
dagster_k8s-0.26.
|
|
16
|
+
dagster_k8s/ops/k8s_job_op.py,sha256=xiBxpuLnIMDd0BqhEGtfl7Z8y0bFHuFmcfep5PuyYqk,22375
|
|
17
|
+
dagster_k8s-0.26.19.dist-info/licenses/LICENSE,sha256=4lsMW-RCvfVD4_F57wrmpe3vX1xwUk_OAKKmV_XT7Z0,11348
|
|
18
|
+
dagster_k8s-0.26.19.dist-info/METADATA,sha256=aryVgUGF93L1c50jgVAj4UFB92edVayuk0Irau5yKac,912
|
|
19
|
+
dagster_k8s-0.26.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
20
|
+
dagster_k8s-0.26.19.dist-info/top_level.txt,sha256=wFPjskoWPlk2hOLugYCaoZhSiZdUcbCA1QZe9I4dals,12
|
|
21
|
+
dagster_k8s-0.26.19.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|