Skip to content
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.

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

replaced deprecated image repos with registry.k8s.io #11152

Merged
merged 1 commit into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/apiserver/config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"DEFAULTPIPELINERUNNERSERVICEACCOUNT": "pipeline-runner",
"CacheEnabled": "true",
"CRON_SCHEDULE_TIMEZONE": "UTC",
"CACHE_IMAGE": "gcr.io/google-containers/busybox",
"CACHE_IMAGE": "registry.k8s.io/busybox",
"CACHE_NODE_RESTRICTIONS": "false"
}
2 changes: 1 addition & 1 deletion backend/src/cache/server/mutation.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func MutatePodIfCached(req *v1beta1.AdmissionRequest, clientMgr ClientManagerInt

// Image selected from Google Container Register(gcr) for it small size, gcr since there
// is not image pull rate limit. For more info see issue: https://github.com/kubeflow/pipelines/issues/4099
image := "gcr.io/google-containers/busybox"
image := "registry.k8s.io/busybox"
if v, ok := os.LookupEnv("CACHE_IMAGE"); ok {
image = v
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/cache/server/mutation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func TestDefaultImage(t *testing.T) {
patchOperation, err := MutatePodIfCached(&fakeAdmissionRequest, fakeClientManager)
assert.Nil(t, err)
container := patchOperation[0].Value.([]corev1.Container)[0]
require.Equal(t, "gcr.io/google-containers/busybox", container.Image)
require.Equal(t, "registry.k8s.io/busybox", container.Image)
}

func TestSetImage(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ data:
mysql_driver: "mysql"
mysql_host: "mysql"
mysql_port: "3306"
cache_image: "gcr.io/google-containers/busybox"
cache_image: "registry.k8s.io/busybox"
cache_node_restrictions: "false"
---
apiVersion: apps/v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ data:
## cacheImage is the image that the mutating webhook will use to patch
## cached steps with. Will be used to echo a message announcing that
## the cached step result will be used. If not set it will default to
## 'gcr.io/google-containers/busybox'
cacheImage: "gcr.io/google-containers/busybox"
## 'registry.k8s.io/busybox'
cacheImage: "registry.k8s.io/busybox"
## cacheNodeRestrictions the dummy container runing if output is cached
## will run with the same affinity and node selector as the default pipeline
## step. This is defaulted to 'false' to allow the pod to be scheduled on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ data:
## cacheImage is the image that the mutating webhook will use to patch
## cached steps with. Will be used to echo a message announcing that
## the cached step result will be used. If not set it will default to
## 'gcr.io/google-containers/busybox'
cacheImage: "gcr.io/google-containers/busybox"
## 'registry.k8s.io/busybox'
cacheImage: "registry.k8s.io/busybox"
## cacheNodeRestrictions the dummy container runing if output is cached
## will run with the same affinity and node selector as the default pipeline
## step. This is defaulted to 'false' to allow the pod to be scheduled on
Expand Down
2 changes: 1 addition & 1 deletion samples/core/resource_ops/resource_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"spec": {
"containers": [{
"name": "sample-container",
"image": "k8s.gcr.io/busybox",
"image": "registry.k8s.io/busybox",
"command": ["/usr/bin/env"]
}],
"restartPolicy": "Never"
Expand Down
2 changes: 1 addition & 1 deletion samples/test/placeholder_concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- {name: input_two, type: String}
implementation:
container:
image: gcr.io/google-containers/busybox
image: registry.k8s.io/busybox
command:
- sh
- -ec
Expand Down
2 changes: 1 addition & 1 deletion samples/test/placeholder_if.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- {name: optional_input_2, type: String, optional: true}
implementation:
container:
image: gcr.io/google-containers/busybox
image: registry.k8s.io/busybox
command:
- echo
args:
Expand Down
2 changes: 1 addition & 1 deletion samples/test/placeholder_if_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- {name: optional_input_2, type: String, optional: true}
implementation:
container:
image: gcr.io/google-containers/busybox
image: registry.k8s.io/busybox
command:
- echo
args:
Expand Down
Loading