Skip to content

Commit d23b72b

Browse files
authored
replaced deprecated image repos with registry.k8s.io (#11152)
Signed-off-by: Humair Khan <HumairAK@users.noreply.github.com>
1 parent 1cded35 commit d23b72b

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

backend/src/apiserver/config/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"DEFAULTPIPELINERUNNERSERVICEACCOUNT": "pipeline-runner",
2424
"CacheEnabled": "true",
2525
"CRON_SCHEDULE_TIMEZONE": "UTC",
26-
"CACHE_IMAGE": "gcr.io/google-containers/busybox",
26+
"CACHE_IMAGE": "registry.k8s.io/busybox",
2727
"CACHE_NODE_RESTRICTIONS": "false"
2828
}

backend/src/cache/server/mutation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func MutatePodIfCached(req *v1beta1.AdmissionRequest, clientMgr ClientManagerInt
167167

168168
// Image selected from Google Container Register(gcr) for it small size, gcr since there
169169
// is not image pull rate limit. For more info see issue: https://github.com/kubeflow/pipelines/issues/4099
170-
image := "gcr.io/google-containers/busybox"
170+
image := "registry.k8s.io/busybox"
171171
if v, ok := os.LookupEnv("CACHE_IMAGE"); ok {
172172
image = v
173173
}

backend/src/cache/server/mutation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func TestDefaultImage(t *testing.T) {
198198
patchOperation, err := MutatePodIfCached(&fakeAdmissionRequest, fakeClientManager)
199199
assert.Nil(t, err)
200200
container := patchOperation[0].Value.([]corev1.Container)[0]
201-
require.Equal(t, "gcr.io/google-containers/busybox", container.Image)
201+
require.Equal(t, "registry.k8s.io/busybox", container.Image)
202202
}
203203

204204
func TestSetImage(t *testing.T) {

manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ data:
190190
mysql_driver: "mysql"
191191
mysql_host: "mysql"
192192
mysql_port: "3306"
193-
cache_image: "gcr.io/google-containers/busybox"
193+
cache_image: "registry.k8s.io/busybox"
194194
cache_node_restrictions: "false"
195195
---
196196
apiVersion: apps/v1

manifests/kustomize/base/installs/generic/pipeline-install-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ data:
6363
## cacheImage is the image that the mutating webhook will use to patch
6464
## cached steps with. Will be used to echo a message announcing that
6565
## the cached step result will be used. If not set it will default to
66-
## 'gcr.io/google-containers/busybox'
67-
cacheImage: "gcr.io/google-containers/busybox"
66+
## 'registry.k8s.io/busybox'
67+
cacheImage: "registry.k8s.io/busybox"
6868
## cacheNodeRestrictions the dummy container runing if output is cached
6969
## will run with the same affinity and node selector as the default pipeline
7070
## step. This is defaulted to 'false' to allow the pod to be scheduled on

manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ data:
6363
## cacheImage is the image that the mutating webhook will use to patch
6464
## cached steps with. Will be used to echo a message announcing that
6565
## the cached step result will be used. If not set it will default to
66-
## 'gcr.io/google-containers/busybox'
67-
cacheImage: "gcr.io/google-containers/busybox"
66+
## 'registry.k8s.io/busybox'
67+
cacheImage: "registry.k8s.io/busybox"
6868
## cacheNodeRestrictions the dummy container runing if output is cached
6969
## will run with the same affinity and node selector as the default pipeline
7070
## step. This is defaulted to 'false' to allow the pod to be scheduled on

samples/core/resource_ops/resource_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"spec": {
3737
"containers": [{
3838
"name": "sample-container",
39-
"image": "k8s.gcr.io/busybox",
39+
"image": "registry.k8s.io/busybox",
4040
"command": ["/usr/bin/env"]
4141
}],
4242
"restartPolicy": "Never"

samples/test/placeholder_concat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
- {name: input_two, type: String}
2424
implementation:
2525
container:
26-
image: gcr.io/google-containers/busybox
26+
image: registry.k8s.io/busybox
2727
command:
2828
- sh
2929
- -ec

samples/test/placeholder_if.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
- {name: optional_input_2, type: String, optional: true}
2424
implementation:
2525
container:
26-
image: gcr.io/google-containers/busybox
26+
image: registry.k8s.io/busybox
2727
command:
2828
- echo
2929
args:

samples/test/placeholder_if_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
- {name: optional_input_2, type: String, optional: true}
2323
implementation:
2424
container:
25-
image: gcr.io/google-containers/busybox
25+
image: registry.k8s.io/busybox
2626
command:
2727
- echo
2828
args:

0 commit comments

Comments
 (0)