Skip to content

Commit 9525b31

Browse files
pacoxupacoxu
committed
migrate from k8s.gcr.io to registry.k8s.io
Signed-off-by: Paco Xu <[email protected]>
1 parent 542e4b2 commit 9525b31

11 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,9 @@ jobs:
300300
- env:
301301
TEST_IMAGE_LIST: ${{github.workspace}}/repolist.toml
302302
CRI_TEST_IMAGES: ${{github.workspace}}/cri-test-images.yaml
303-
BUSYBOX_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/busybox:1.29-2"
304-
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10"
305-
WEBSERVER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/nginx:1.14-2"
303+
BUSYBOX_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/busybox:1.29-2"
304+
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/resource-consumer:1.10"
305+
WEBSERVER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/nginx:1.14-2"
306306
run: |
307307
cat > "${{ env.TEST_IMAGE_LIST }}" << EOF
308308
busybox = "${{ env.BUSYBOX_TESTING_IMAGE_REF }}"

‎.github/workflows/windows-periodic.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ env:
2323
DEFAULT_ADMIN_USERNAME: azureuser
2424
SSH_OPTS: "-o ServerAliveInterval=20 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
2525
REMOTE_VM_BIN_PATH: "c:\\containerd\\bin"
26-
BUSYBOX_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/busybox:1.29-2"
27-
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10"
28-
WEBSERVER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/nginx:1.14-2"
26+
BUSYBOX_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/busybox:1.29-2"
27+
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/resource-consumer:1.10"
28+
WEBSERVER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/nginx:1.14-2"
2929

3030

3131
jobs:

‎contrib/ansible/cri-containerd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
# TODO This needs to be removed once we have consistent concurrent pull results
6262
- name: "Pre-pull pause container image"
6363
shell: |
64-
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.7
64+
/usr/local/bin/ctr pull registry.k8s.io/pause:3.7
6565
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
66-
pull k8s.gcr.io/pause:3.7
66+
pull registry.k8s.io/pause:3.7

‎docs/cri/config.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ version = 2
137137
selinux_category_range = 1024
138138
139139
# sandbox_image is the image used by sandbox container.
140-
sandbox_image = "k8s.gcr.io/pause:3.7"
140+
sandbox_image = "registry.k8s.io/pause:3.7"
141141
142142
# stats_collect_period is the period (in seconds) of snapshots stats collection.
143143
stats_collect_period = 10

‎docs/cri/crictl.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ command. With the load command you inject a container image into the container
5959
runtime from a file. First you need to create a container image tarball. For
6060
example to create an image tarball for a pause container using Docker:
6161
```console
62-
$ docker pull k8s.gcr.io/pause:3.7
62+
$ docker pull registry.k8s.io/pause:3.7
6363
3.7: Pulling from pause
6464
7582c2cc65ef: Pull complete
6565
Digest: sha256:bb6ed397957e9ca7c65ada0db5c5d1c707c9c8afc80a94acbe69f3ae76988f0c
66-
Status: Downloaded newer image for k8s.gcr.io/pause:3.7
67-
k8s.gcr.io/pause:3.7
68-
$ docker save k8s.gcr.io/pause:3.7 -o pause.tar
66+
Status: Downloaded newer image for registry.k8s.io/pause:3.7
67+
registry.k8s.io/pause:3.7
68+
$ docker save registry.k8s.io/pause:3.7 -o pause.tar
6969
```
7070
Then use `ctr` to load the container image into the container runtime:
7171
```console
7272
# The cri plugin uses the "k8s.io" containerd namespace.
7373
$ sudo ctr -n=k8s.io images import pause.tar
74-
Loaded image: k8s.gcr.io/pause:3.7
74+
Loaded image: registry.k8s.io/pause:3.7
7575
```
7676
List images and inspect the pause image:
7777
```console
7878
$ sudo crictl images
7979
IMAGE TAG IMAGE ID SIZE
8080
docker.io/library/busybox latest f6e427c148a76 728kB
81-
k8s.gcr.io/pause 3.7 221177c6082a8 311kB
81+
registry.k8s.io/pause 3.7 221177c6082a8 311kB
8282
$ sudo crictl inspecti 221177c6082a8
8383
... displays information about the pause image.
84-
$ sudo crictl inspecti k8s.gcr.io/pause:3.7
84+
$ sudo crictl inspecti registry.k8s.io/pause:3.7
8585
... displays information about the pause image.
8686
```
8787

@@ -201,7 +201,7 @@ $ crictl info
201201
}
202202
},
203203
"streamServerPort": "10010",
204-
"sandboxImage": "k8s.gcr.io/pause:3.7",
204+
"sandboxImage": "registry.k8s.io/pause:3.7",
205205
"statsCollectPeriod": 10,
206206
"containerdRootDir": "/var/lib/containerd",
207207
"containerdEndpoint": "unix:///run/containerd/containerd.sock",

‎integration/client/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
384384

385385
// Note: Must be different to the image used in TestImagePullAllPlatforms
386386
// or it will see the content pulled by that, and fail.
387-
img, err := client.Fetch(ctx, "k8s.gcr.io/e2e-test-images/busybox:1.29-2", opts...)
387+
img, err := client.Fetch(ctx, "registry.k8s.io/e2e-test-images/busybox:1.29-2", opts...)
388388
if err != nil {
389389
t.Fatal(err)
390390
}

‎integration/client/image_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestImageIsUnpacked(t *testing.T) {
8080

8181
func TestImagePullWithDistSourceLabel(t *testing.T) {
8282
var (
83-
source = "k8s.gcr.io"
83+
source = "registry.k8s.io"
8484
repoName = "pause"
8585
tag = "3.6"
8686
)
@@ -232,7 +232,7 @@ func TestImageUsage(t *testing.T) {
232232
func TestImageSupportedBySnapshotter_Error(t *testing.T) {
233233
var unsupportedImage string
234234
if runtime.GOOS == "windows" {
235-
unsupportedImage = "k8s.gcr.io/pause-amd64:3.2"
235+
unsupportedImage = "registry.k8s.io/pause-amd64:3.2"
236236
} else {
237237
unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809"
238238
}

‎integration/images/image_list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func initImages(imageListFile string) {
4949
imageList = ImageList{
5050
Alpine: "docker.io/library/alpine:latest",
5151
BusyBox: "docker.io/library/busybox:latest",
52-
Pause: "k8s.gcr.io/pause:3.7",
53-
ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10",
52+
Pause: "registry.k8s.io/pause:3.7",
53+
ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10",
5454
VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1",
5555
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",
5656
}

‎integration/images/image_list.sample.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
alpine = "docker.io/library/alpine:latest"
22
busybox = "docker.io/library/busybox:latest"
3-
pause = "k8s.gcr.io/pause:3.7"
3+
pause = "registry.k8s.io/pause:3.7"
44
VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1"
55
VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1"

‎pkg/cri/config/config_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func DefaultConfig() PluginConfig {
9494
TLSKeyFile: "",
9595
TLSCertFile: "",
9696
},
97-
SandboxImage: "k8s.gcr.io/pause:3.7",
97+
SandboxImage: "registry.k8s.io/pause:3.7",
9898
StatsCollectPeriod: 10,
9999
SystemdCgroup: false,
100100
MaxContainerLogLineSize: 16 * 1024,

0 commit comments

Comments
 (0)