Skip to content

Commit

Permalink
Update gold files & image masking to use ghcr
Browse files Browse the repository at this point in the history
  • Loading branch information
CarterFendley committed Jan 28, 2025
1 parent 13f75c2 commit 8d0113b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 25 deletions.
6 changes: 3 additions & 3 deletions backend/src/v2/compiler/argocompiler/argo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
11 changes: 6 additions & 5 deletions backend/src/v2/compiler/argocompiler/testdata/exit_handler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions backend/src/v2/compiler/argocompiler/testdata/importer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -147,7 +147,6 @@ spec:
name: kfp-launcher
- mountPath: /gcs
name: gcs-scratch

- mountPath: /s3
name: s3-scratch
- mountPath: /minio
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 8d0113b

Please sign in to comment.