Skip to content

fix(backend): Use KFP_POD_NAME in PVC creation #12499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(backend): Use KFP_POD_NAME in PVC creation #12499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/src/v2/compiler/argocompiler/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (c *workflowCompiler) addContainerDriverTemplate() string {
Command: c.driverCommand,
Args: args,
Resources: driverResources,
Env: proxy.GetConfig().GetEnvVars(),
Env: append(proxy.GetConfig().GetEnvVars(), commonEnvs...),
},
}
// If TLS is enabled (apiserver or metadata), add the custom CA bundle to the container driver template.
Expand Down
2 changes: 1 addition & 1 deletion backend/src/v2/config/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func InPodNamespace() (string, error) {

// InPodName gets the pod name from inside a Kubernetes Pod.
func InPodName() (string, error) {
if podName, exists := os.LookupEnv("ARGO_POD_NAME"); exists && podName != "" {
if podName, exists := os.LookupEnv("KFP_POD_NAME"); exists && podName != "" {
return podName, nil
}
podName, err := os.ReadFile("/etc/hostname")
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/add_numbers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/arguments_parameters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/artifact_cache.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/artifact_crust.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/artifacts_complex.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/artifacts_simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/collected_artifacts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/collected_parameters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/component_with_metadata_fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/component_with_optional_inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/component_with_pip_index_urls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/component_with_pip_install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/component_with_pip_install_in_venv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/components_with_optional_artifacts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/concat_message.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/conditional_producer_and_consumers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_component_with_no_inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_no_input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_with_artifact_output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_with_concat_placeholder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_with_if_placeholder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
9 changes: 9 additions & 0 deletions test_data/compiled-workflows/container_with_placeholder_in_fstring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ spec:
- "8080"
command:
- driver
env:
- name: KFP_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: KFP_POD_UID
valueFrom:
fieldRef:
fieldPath: metadata.uid
image: ghcr.io/kubeflow/kfp-driver:latest
name: ""
resources:
Expand Down
Loading
Loading