From 8d0113bcfcb6d1fd9e1dee66b436d8f5b82cfacc Mon Sep 17 00:00:00 2001 From: "carter.fendley" Date: Tue, 28 Jan 2025 12:54:48 -0500 Subject: [PATCH] Update gold files & image masking to use ghcr --- backend/src/v2/compiler/argocompiler/argo_test.go | 6 +++--- .../testdata/create_mount_delete_dynamic_pvc.yaml | 6 +++--- .../argocompiler/testdata/create_pod_metadata.yaml | 6 +++--- .../compiler/argocompiler/testdata/exit_handler.yaml | 11 ++++++----- .../compiler/argocompiler/testdata/hello_world.yaml | 6 +++--- .../v2/compiler/argocompiler/testdata/importer.yaml | 4 ++-- .../testdata/multiple_parallel_loops.yaml | 12 ++++++------ 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/backend/src/v2/compiler/argocompiler/argo_test.go b/backend/src/v2/compiler/argocompiler/argo_test.go index ae18d922cac1..238d29be9fb9 100644 --- a/backend/src/v2/compiler/argocompiler/argo_test.go +++ b/backend/src/v2/compiler/argocompiler/argo_test.go @@ -116,14 +116,14 @@ func Test_argo_compiler(t *testing.T) { // mask the driver launcher image hash to maintain test stability for _, template := range wf.Spec.Templates { if template.Container != nil && strings.Contains(template.Container.Image, "kfp-driver") { - template.Container.Image = "gcr.io/ml-pipeline/kfp-driver" + template.Container.Image = "ghcr.io/kubeflow/kfp-driver" } if template.Container != nil && strings.Contains(template.Container.Image, "kfp-launcher") { - template.Container.Image = "gcr.io/ml-pipeline/kfp-launcher" + template.Container.Image = "ghcr.io/kubeflow/kfp-launcher" } for i := range template.InitContainers { if strings.Contains(template.InitContainers[i].Image, "kfp-launcher") { - template.InitContainers[i].Image = "gcr.io/ml-pipeline/kfp-launcher" + template.InitContainers[i].Image = "ghcr.io/kubeflow/kfp-launcher" } } } diff --git a/backend/src/v2/compiler/argocompiler/testdata/create_mount_delete_dynamic_pvc.yaml b/backend/src/v2/compiler/argocompiler/testdata/create_mount_delete_dynamic_pvc.yaml index 2a9cc503d3de..643780002bd3 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/create_mount_delete_dynamic_pvc.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/create_mount_delete_dynamic_pvc.yaml @@ -67,7 +67,7 @@ spec: - '{{inputs.parameters.kubernetes-config}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: @@ -160,7 +160,7 @@ spec: - /kfp-launcher/launch command: - launcher-v2 - image: gcr.io/ml-pipeline/kfp-launcher + image: ghcr.io/kubeflow/kfp-launcher name: kfp-launcher resources: limits: @@ -302,7 +302,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: diff --git a/backend/src/v2/compiler/argocompiler/testdata/create_pod_metadata.yaml b/backend/src/v2/compiler/argocompiler/testdata/create_pod_metadata.yaml index dead21a837ec..e4ff6c8a4358 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/create_pod_metadata.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/create_pod_metadata.yaml @@ -55,7 +55,7 @@ spec: - '{{inputs.parameters.kubernetes-config}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: @@ -148,7 +148,7 @@ spec: - /kfp-launcher/launch command: - launcher-v2 - image: gcr.io/ml-pipeline/kfp-launcher + image: ghcr.io/kubeflow/kfp-launcher name: kfp-launcher resources: limits: @@ -245,7 +245,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: diff --git a/backend/src/v2/compiler/argocompiler/testdata/exit_handler.yaml b/backend/src/v2/compiler/argocompiler/testdata/exit_handler.yaml index 4754f957c930..0d1945f6175e 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/exit_handler.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/exit_handler.yaml @@ -72,7 +72,7 @@ spec: - '{{inputs.parameters.kubernetes-config}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: @@ -160,11 +160,12 @@ spec: - mountPath: /.config name: dot-config-scratch initContainers: - - command: - - launcher-v2 + - args: - --copy - /kfp-launcher/launch - image: gcr.io/ml-pipeline/kfp-launcher + command: + - launcher-v2 + image: ghcr.io/kubeflow/kfp-launcher name: kfp-launcher resources: limits: @@ -307,7 +308,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: diff --git a/backend/src/v2/compiler/argocompiler/testdata/hello_world.yaml b/backend/src/v2/compiler/argocompiler/testdata/hello_world.yaml index 58114781a380..9bb290c9c048 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/hello_world.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/hello_world.yaml @@ -53,7 +53,7 @@ spec: - '{{inputs.parameters.kubernetes-config}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: @@ -146,7 +146,7 @@ spec: - /kfp-launcher/launch command: - launcher-v2 - image: gcr.io/ml-pipeline/kfp-launcher + image: ghcr.io/kubeflow/kfp-launcher name: kfp-launcher resources: limits: @@ -235,7 +235,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: diff --git a/backend/src/v2/compiler/argocompiler/testdata/importer.yaml b/backend/src/v2/compiler/argocompiler/testdata/importer.yaml index 23ec461c3073..f0cd5ffb70e5 100644 --- a/backend/src/v2/compiler/argocompiler/testdata/importer.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/importer.yaml @@ -59,7 +59,7 @@ spec: - configMapRef: name: metadata-grpc-configmap optional: true - image: gcr.io/ml-pipeline/kfp-launcher + image: ghcr.io/kubeflow/kfp-launcher name: "" resources: limits: @@ -123,7 +123,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: diff --git a/backend/src/v2/compiler/argocompiler/testdata/multiple_parallel_loops.yaml b/backend/src/v2/compiler/argocompiler/testdata/multiple_parallel_loops.yaml index 738762f80775..5dca46ade250 100755 --- a/backend/src/v2/compiler/argocompiler/testdata/multiple_parallel_loops.yaml +++ b/backend/src/v2/compiler/argocompiler/testdata/multiple_parallel_loops.yaml @@ -70,7 +70,7 @@ spec: - '{{inputs.parameters.kubernetes-config}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: @@ -147,7 +147,6 @@ spec: name: kfp-launcher - mountPath: /gcs name: gcs-scratch - - mountPath: /s3 name: s3-scratch - mountPath: /minio @@ -159,11 +158,12 @@ spec: - mountPath: /.config name: dot-config-scratch initContainers: - - command: - - launcher-v2 + - args: - --copy - /kfp-launcher/launch - image: gcr.io/ml-pipeline/kfp-launcher + command: + - launcher-v2 + image: ghcr.io/kubeflow/kfp-launcher name: kfp-launcher resources: limits: @@ -326,7 +326,7 @@ spec: - '{{outputs.parameters.condition.path}}' command: - driver - image: gcr.io/ml-pipeline/kfp-driver + image: ghcr.io/kubeflow/kfp-driver name: "" resources: limits: