github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

migrate from k8s.gcr.io to registry.k8s.io

Browse Source 
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
This commit is contained in:
Paco Xu 2022-06-09 16:14:10 +08:00
parent 542e4b219d
commit 9525b3148a
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -300,9 +300,9 @@ jobs:
- env: - env:
TEST_IMAGE_LIST: ${{github.workspace}}/repolist.toml TEST_IMAGE_LIST: ${{github.workspace}}/repolist.toml
CRI_TEST_IMAGES: ${{github.workspace}}/cri-test-images.yaml CRI_TEST_IMAGES: ${{github.workspace}}/cri-test-images.yaml
BUSYBOX_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/busybox:1.29-2" BUSYBOX_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/busybox:1.29-2"
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10" RESOURCE_CONSUMER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/resource-consumer:1.10"
WEBSERVER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/nginx:1.14-2" WEBSERVER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/nginx:1.14-2"
run: | run: |
cat > "${{ env.TEST_IMAGE_LIST }}" << EOF cat > "${{ env.TEST_IMAGE_LIST }}" << EOF
busybox = "${{ env.BUSYBOX_TESTING_IMAGE_REF }}" busybox = "${{ env.BUSYBOX_TESTING_IMAGE_REF }}"

6
.github/workflows/windows-periodic.yml vendored
View File

@ -23,9 +23,9 @@ env:
DEFAULT_ADMIN_USERNAME: azureuser DEFAULT_ADMIN_USERNAME: azureuser
SSH_OPTS: "-o ServerAliveInterval=20 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" SSH_OPTS: "-o ServerAliveInterval=20 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
REMOTE_VM_BIN_PATH: "c:\\containerd\\bin" REMOTE_VM_BIN_PATH: "c:\\containerd\\bin"
BUSYBOX_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/busybox:1.29-2" BUSYBOX_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/busybox:1.29-2"
RESOURCE_CONSUMER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10" RESOURCE_CONSUMER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/resource-consumer:1.10"
WEBSERVER_TESTING_IMAGE_REF: "k8s.gcr.io/e2e-test-images/nginx:1.14-2" WEBSERVER_TESTING_IMAGE_REF: "registry.k8s.io/e2e-test-images/nginx:1.14-2"
jobs: jobs:

4
contrib/ansible/cri-containerd.yaml
View File

@ -61,6 +61,6 @@
# TODO This needs to be removed once we have consistent concurrent pull results # TODO This needs to be removed once we have consistent concurrent pull results
- name: "Pre-pull pause container image" - name: "Pre-pull pause container image"
shell: | shell: |
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.7 /usr/local/bin/ctr pull registry.k8s.io/pause:3.7
/usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \ /usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
pull k8s.gcr.io/pause:3.7 pull registry.k8s.io/pause:3.7

2
docs/cri/config.md
View File

@ -137,7 +137,7 @@ version = 2
selinux_category_range = 1024 selinux_category_range = 1024
# sandbox_image is the image used by sandbox container. # sandbox_image is the image used by sandbox container.
sandbox_image = "k8s.gcr.io/pause:3.7" sandbox_image = "registry.k8s.io/pause:3.7"
# stats_collect_period is the period (in seconds) of snapshots stats collection. # stats_collect_period is the period (in seconds) of snapshots stats collection.
stats_collect_period = 10 stats_collect_period = 10

16
docs/cri/crictl.md
View File

@ -59,29 +59,29 @@ command. With the load command you inject a container image into the container
runtime from a file. First you need to create a container image tarball. For runtime from a file. First you need to create a container image tarball. For
example to create an image tarball for a pause container using Docker: example to create an image tarball for a pause container using Docker:
```console ```console
$ docker pull k8s.gcr.io/pause:3.7 $ docker pull registry.k8s.io/pause:3.7
3.7: Pulling from pause 3.7: Pulling from pause
7582c2cc65ef: Pull complete 7582c2cc65ef: Pull complete
Digest: sha256:bb6ed397957e9ca7c65ada0db5c5d1c707c9c8afc80a94acbe69f3ae76988f0c Digest: sha256:bb6ed397957e9ca7c65ada0db5c5d1c707c9c8afc80a94acbe69f3ae76988f0c
Status: Downloaded newer image for k8s.gcr.io/pause:3.7 Status: Downloaded newer image for registry.k8s.io/pause:3.7
k8s.gcr.io/pause:3.7 registry.k8s.io/pause:3.7
$ docker save k8s.gcr.io/pause:3.7 -o pause.tar $ docker save registry.k8s.io/pause:3.7 -o pause.tar
``` ```
Then use `ctr` to load the container image into the container runtime: Then use `ctr` to load the container image into the container runtime:
```console ```console
# The cri plugin uses the "k8s.io" containerd namespace. # The cri plugin uses the "k8s.io" containerd namespace.
$ sudo ctr -n=k8s.io images import pause.tar $ sudo ctr -n=k8s.io images import pause.tar
Loaded image: k8s.gcr.io/pause:3.7 Loaded image: registry.k8s.io/pause:3.7
``` ```
List images and inspect the pause image: List images and inspect the pause image:
```console ```console
$ sudo crictl images $ sudo crictl images
IMAGE TAG IMAGE ID SIZE IMAGE TAG IMAGE ID SIZE
docker.io/library/busybox latest f6e427c148a76 728kB docker.io/library/busybox latest f6e427c148a76 728kB
k8s.gcr.io/pause 3.7 221177c6082a8 311kB registry.k8s.io/pause 3.7 221177c6082a8 311kB
$ sudo crictl inspecti 221177c6082a8 $ sudo crictl inspecti 221177c6082a8
... displays information about the pause image. ... displays information about the pause image.
$ sudo crictl inspecti k8s.gcr.io/pause:3.7 $ sudo crictl inspecti registry.k8s.io/pause:3.7
... displays information about the pause image. ... displays information about the pause image.
``` ```
@ -201,7 +201,7 @@ $ crictl info
} }
}, },
"streamServerPort": "10010", "streamServerPort": "10010",
"sandboxImage": "k8s.gcr.io/pause:3.7", "sandboxImage": "registry.k8s.io/pause:3.7",
"statsCollectPeriod": 10, "statsCollectPeriod": 10,
"containerdRootDir": "/var/lib/containerd", "containerdRootDir": "/var/lib/containerd",
"containerdEndpoint": "unix:///run/containerd/containerd.sock", "containerdEndpoint": "unix:///run/containerd/containerd.sock",

2
integration/client/client_test.go
View File

@ -384,7 +384,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
// Note: Must be different to the image used in TestImagePullAllPlatforms // Note: Must be different to the image used in TestImagePullAllPlatforms
// or it will see the content pulled by that, and fail. // or it will see the content pulled by that, and fail.
img, err := client.Fetch(ctx, "k8s.gcr.io/e2e-test-images/busybox:1.29-2", opts...) img, err := client.Fetch(ctx, "registry.k8s.io/e2e-test-images/busybox:1.29-2", opts...)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
integration/client/image_test.go
View File

@ -80,7 +80,7 @@ func TestImageIsUnpacked(t *testing.T) {
func TestImagePullWithDistSourceLabel(t *testing.T) { func TestImagePullWithDistSourceLabel(t *testing.T) {
var ( var (
source = "k8s.gcr.io" source = "registry.k8s.io"
repoName = "pause" repoName = "pause"
tag = "3.6" tag = "3.6"
) )
@ -232,7 +232,7 @@ func TestImageUsage(t *testing.T) {
func TestImageSupportedBySnapshotter_Error(t *testing.T) { func TestImageSupportedBySnapshotter_Error(t *testing.T) {
var unsupportedImage string var unsupportedImage string
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
unsupportedImage = "k8s.gcr.io/pause-amd64:3.2" unsupportedImage = "registry.k8s.io/pause-amd64:3.2"
} else { } else {
unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809" unsupportedImage = "mcr.microsoft.com/windows/nanoserver:1809"
} }

4
integration/images/image_list.go
View File

@ -49,8 +49,8 @@ func initImages(imageListFile string) {
imageList = ImageList{ imageList = ImageList{
Alpine: "docker.io/library/alpine:latest", Alpine: "docker.io/library/alpine:latest",
BusyBox: "docker.io/library/busybox:latest", BusyBox: "docker.io/library/busybox:latest",
Pause: "k8s.gcr.io/pause:3.7", Pause: "registry.k8s.io/pause:3.7",
ResourceConsumer: "k8s.gcr.io/e2e-test-images/resource-consumer:1.10", ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10",
VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1", VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1",
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1", VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",
} }

2
integration/images/image_list.sample.toml
View File

@ -1,5 +1,5 @@
alpine = "docker.io/library/alpine:latest" alpine = "docker.io/library/alpine:latest"
busybox = "docker.io/library/busybox:latest" busybox = "docker.io/library/busybox:latest"
pause = "k8s.gcr.io/pause:3.7" pause = "registry.k8s.io/pause:3.7"
VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1" VolumeCopyUp = "ghcr.io/containerd/volume-copy-up:2.1"
VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1" VolumeOwnership = "ghcr.io/containerd/volume-ownership:2.1"

2
pkg/cri/config/config_unix.go
View File

@ -94,7 +94,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "k8s.gcr.io/pause:3.7", SandboxImage: "registry.k8s.io/pause:3.7",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
SystemdCgroup: false, SystemdCgroup: false,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,

2
pkg/cri/config/config_windows.go
View File

@ -53,7 +53,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "k8s.gcr.io/pause:3.7", SandboxImage: "registry.k8s.io/pause:3.7",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,
MaxConcurrentDownloads: 3, MaxConcurrentDownloads: 3,