From ccbb5acf68e4af6a177a2547c3e5613bef036308 Mon Sep 17 00:00:00 2001 From: Humair Khan Date: Thu, 12 Sep 2024 00:00:21 -0400 Subject: [PATCH] replaced deprecated image repos with registry.k8s.io (#11152) Signed-off-by: Humair Khan Signed-off-by: sefgsefg --- backend/src/apiserver/config/config.json | 2 +- backend/src/cache/server/mutation.go | 2 +- backend/src/cache/server/mutation_test.go | 2 +- .../chart/kubeflow-pipelines/templates/cache.yaml | 2 +- .../base/installs/generic/pipeline-install-config.yaml | 4 ++-- .../installs/generic/postgres/pipeline-install-config.yaml | 4 ++-- samples/core/resource_ops/resource_ops.py | 2 +- samples/test/placeholder_concat.py | 2 +- samples/test/placeholder_if.py | 2 +- samples/test/placeholder_if_v2.py | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/src/apiserver/config/config.json b/backend/src/apiserver/config/config.json index aa7088ce77cd..3191ef5057da 100644 --- a/backend/src/apiserver/config/config.json +++ b/backend/src/apiserver/config/config.json @@ -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" } diff --git a/backend/src/cache/server/mutation.go b/backend/src/cache/server/mutation.go index 9aa931e233b4..3f76d129ad03 100644 --- a/backend/src/cache/server/mutation.go +++ b/backend/src/cache/server/mutation.go @@ -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 } diff --git a/backend/src/cache/server/mutation_test.go b/backend/src/cache/server/mutation_test.go index 28ab114e1e5c..5ad0fc8c1396 100644 --- a/backend/src/cache/server/mutation_test.go +++ b/backend/src/cache/server/mutation_test.go @@ -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) { diff --git a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/cache.yaml b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/cache.yaml index 1652d5b67ab5..b27de0c4d72b 100644 --- a/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/cache.yaml +++ b/manifests/gcp_marketplace/chart/kubeflow-pipelines/templates/cache.yaml @@ -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 diff --git a/manifests/kustomize/base/installs/generic/pipeline-install-config.yaml b/manifests/kustomize/base/installs/generic/pipeline-install-config.yaml index 8c1b4d5961e4..8f0c72086cbc 100644 --- a/manifests/kustomize/base/installs/generic/pipeline-install-config.yaml +++ b/manifests/kustomize/base/installs/generic/pipeline-install-config.yaml @@ -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 diff --git a/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml b/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml index f5d87c679711..fbfa8da41a18 100644 --- a/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml +++ b/manifests/kustomize/base/installs/generic/postgres/pipeline-install-config.yaml @@ -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 diff --git a/samples/core/resource_ops/resource_ops.py b/samples/core/resource_ops/resource_ops.py index 873fee5f9194..24932ca29f6a 100644 --- a/samples/core/resource_ops/resource_ops.py +++ b/samples/core/resource_ops/resource_ops.py @@ -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" diff --git a/samples/test/placeholder_concat.py b/samples/test/placeholder_concat.py index 84f07fb2233c..92ceab2996ae 100644 --- a/samples/test/placeholder_concat.py +++ b/samples/test/placeholder_concat.py @@ -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 diff --git a/samples/test/placeholder_if.py b/samples/test/placeholder_if.py index e0b5e04726f6..b5bceec2fc34 100644 --- a/samples/test/placeholder_if.py +++ b/samples/test/placeholder_if.py @@ -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: diff --git a/samples/test/placeholder_if_v2.py b/samples/test/placeholder_if_v2.py index f6f5063e2de2..2f06aed5fa2e 100644 --- a/samples/test/placeholder_if_v2.py +++ b/samples/test/placeholder_if_v2.py @@ -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: