From 232299c8702cda23c522f14cbc3f5efab90b1d77 Mon Sep 17 00:00:00 2001 From: Masayuki Ishii Date: Mon, 4 Dec 2023 09:11:35 +0000 Subject: [PATCH] wip --- README.md | 6 +++--- RELEASE.md | 2 +- docker/Dockerfile | 2 +- docs/design.md | 2 +- example/docker-compose.yml | 4 ++-- mtest/Makefile | 2 +- mtest/kubernetes_test.go | 4 ++-- mtest/node-ign.yml | 2 +- mtest/reboot-alittleslow-eviction-deployment.yaml | 2 +- mtest/reboot-job-completed.yaml | 2 +- mtest/reboot-job-running.yaml | 2 +- mtest/reboot-slow-eviction-deployment.yaml | 2 +- mtest/suite_test.go | 2 +- sonobuoy/docker-compose.yml | 6 +++--- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 5f4987c44..0b889089a 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ Usage ```console $ docker run -d --read-only \ --network host --name cke \ - quay.io/cybozu/cke:1.18 [options...] + ghcr.io/cybozu-go/cke:1.27 [options...] ``` ### Install `ckecli` and `cke-localproxy` to a host directory @@ -142,13 +142,13 @@ $ docker run -d --read-only \ $ docker run --rm -u root:root \ --entrypoint /usr/local/cke/install-tools \ --mount type=bind,src=DIR,target=/host \ - quay.io/cybozu/cke:1.18 + ghcr.io/cybozu-go/cke:1.27 ``` Docker images ------------- -Docker images are available on [Quay.io](https://quay.io/repository/cybozu/cke) +Docker images are available on [ghcr.io](https://github.com/cybozu-go/cke/pkgs/container/cke) Feedback -------- diff --git a/RELEASE.md b/RELEASE.md index ba9fb9ebe..bacf4b0b8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -74,7 +74,7 @@ It should look like: $ git push origin "v$VERSION" ``` -Then GitHub Actions automatically builds and pushes the tagged container image to [quay.io](https://quay.io/cybozu/cke). +Then GitHub Actions automatically builds and pushes the tagged container image to [ghcr.io](https://github.com/cybozu-go/cke/pkgs/container/cke). GitHub Actions also creates a GitHub release automatically after running [sonobuoy](./sonobuoy) tests. So, **DO NOT MANUALLY CREATE GITHUB RELEASES**. The test results will be attached to the GitHub diff --git a/docker/Dockerfile b/docker/Dockerfile index 5bea646ef..cbef97ac0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # CKE container -FROM quay.io/cybozu/ubuntu:22.04 +FROM ghcr.io/cybozu/ubuntu:22.04 COPY cke /usr/local/cke/bin/cke COPY ckecli /usr/local/cke/bin/ckecli diff --git a/docs/design.md b/docs/design.md index c5ea4de44..c19b40657 100644 --- a/docs/design.md +++ b/docs/design.md @@ -80,7 +80,7 @@ Implementation policies * Assets are compiled into Docker images. - * Third-party docker images should be mirrored on `quay.io/cybozu`. + * Third-party docker images should be mirrored on `ghcr.io/cybozu`. * CKE does not install any tools onto node OS other than containers. diff --git a/example/docker-compose.yml b/example/docker-compose.yml index f1df162c2..5749a7b57 100644 --- a/example/docker-compose.yml +++ b/example/docker-compose.yml @@ -19,7 +19,7 @@ services: - /entrypoint.sh setup: container_name: setup - image: quay.io/cybozu/ubuntu-debug:22.04 + image: ghcr.io/cybozu/ubuntu-debug:22.04 networks: app_net: ipv4_address: 172.30.0.12 @@ -56,7 +56,7 @@ services: - /entrypoint.sh etcd: container_name: etcd - image: quay.io/cybozu/etcd:3.5 + image: ghcr.io/cybozu/etcd:3.5 networks: app_net: ipv4_address: 172.30.0.14 diff --git a/mtest/Makefile b/mtest/Makefile index cd0500e7b..ef87dd8fc 100644 --- a/mtest/Makefile +++ b/mtest/Makefile @@ -42,7 +42,7 @@ OUTPUT := ./output DATA_DIR := $(abspath $(OUTPUT))/data FLATCAR_IMAGE := flatcar_production_qemu_image.img CKE_IMAGE := $(abspath $(OUTPUT))/cke.img -CKE_IMAGE_URL := quay.io/cybozu/cke:dev +CKE_IMAGE_URL := ghcr.io/cybozu-go/cke:dev CKECLUSTER := $(DATA_DIR)/cluster.yml CKECONFIG := $(abspath $(OUTPUT))/cke.yml KUBECTL := $(abspath $(OUTPUT))/kubectl diff --git a/mtest/kubernetes_test.go b/mtest/kubernetes_test.go index 7df7af153..a0dabc648 100644 --- a/mtest/kubernetes_test.go +++ b/mtest/kubernetes_test.go @@ -123,7 +123,7 @@ func testKubernetes() { }`, node) overrideFile := remoteTempFile(overrides) _, stderr, err = kubectl("run", - "-n="+namespace, "--image=quay.io/cybozu/ubuntu:22.04", "--overrides=\"$(cat "+overrideFile+")\"", "--restart=Never", + "-n="+namespace, "--image=ghcr.io/cybozu/ubuntu:22.04", "--overrides=\"$(cat "+overrideFile+")\"", "--restart=Never", "client", "--", "pause") Expect(err).NotTo(HaveOccurred(), "stderr: %s, err: %v", stderr, err) @@ -251,7 +251,7 @@ func testKubernetes() { }).Should(Succeed()) By("querying www.cybozu.com using node DNS from ubuntu pod") - _, stderr, err = kubectl("run", "-n="+namespace, "--image=quay.io/cybozu/ubuntu:22.04", "--restart=Never", + _, stderr, err = kubectl("run", "-n="+namespace, "--image=ghcr.io/cybozu/ubuntu:22.04", "--restart=Never", "client", "--", "pause") Expect(err).NotTo(HaveOccurred(), "stderr: %s", stderr) Eventually(func() error { diff --git a/mtest/node-ign.yml b/mtest/node-ign.yml index 40512d4b9..3befcd012 100644 --- a/mtest/node-ign.yml +++ b/mtest/node-ign.yml @@ -99,7 +99,7 @@ storage: stream_server_port = "10010" stream_idle_timeout = "4h0m0s" enable_selinux = false - sandbox_image = "quay.io/cybozu/pause:3.1" + sandbox_image = "ghcr.io/cybozu/pause:3.9" stats_collect_period = 10 systemd_cgroup = false enable_tls_streaming = false diff --git a/mtest/reboot-alittleslow-eviction-deployment.yaml b/mtest/reboot-alittleslow-eviction-deployment.yaml index 1f3d492bf..9c4554887 100644 --- a/mtest/reboot-alittleslow-eviction-deployment.yaml +++ b/mtest/reboot-alittleslow-eviction-deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ubuntu - image: quay.io/cybozu/ubuntu:22.04 + image: ghcr.io/cybozu/ubuntu:22.04 # Because sleep command ignores SIGTERM, # this Pod will stay Terminating state after deletion # for the time specified by terminationGracePeriodSeconds. diff --git a/mtest/reboot-job-completed.yaml b/mtest/reboot-job-completed.yaml index 3969300f9..49cb1d3bc 100644 --- a/mtest/reboot-job-completed.yaml +++ b/mtest/reboot-job-completed.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: ubuntu - image: quay.io/cybozu/ubuntu:22.04 + image: ghcr.io/cybozu/ubuntu:22.04 command: ["true"] restartPolicy: Never backoffLimit: 1 diff --git a/mtest/reboot-job-running.yaml b/mtest/reboot-job-running.yaml index 186273d3f..b34398c71 100644 --- a/mtest/reboot-job-running.yaml +++ b/mtest/reboot-job-running.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: ubuntu - image: quay.io/cybozu/ubuntu:22.04 + image: ghcr.io/cybozu/ubuntu:22.04 command: ["sleep", "3600"] restartPolicy: Never backoffLimit: 1 diff --git a/mtest/reboot-slow-eviction-deployment.yaml b/mtest/reboot-slow-eviction-deployment.yaml index eb6e16a11..cef2d9876 100644 --- a/mtest/reboot-slow-eviction-deployment.yaml +++ b/mtest/reboot-slow-eviction-deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ubuntu - image: quay.io/cybozu/ubuntu:22.04 + image: ghcr.io/cybozu/ubuntu:22.04 # Because sleep command ignores SIGTERM, # this Pod will stay Terminating state after deletion # for the time specified by terminationGracePeriodSeconds. diff --git a/mtest/suite_test.go b/mtest/suite_test.go index 8e31a9d6d..e4356ef2c 100644 --- a/mtest/suite_test.go +++ b/mtest/suite_test.go @@ -30,7 +30,7 @@ func TestMtest(t *testing.T) { var _ = BeforeSuite(func() { img := ckeImageURL if testSuite == "upgrade" { - img = "quay.io/cybozu/cke:" + cke.Version + img = "ghcr.io/cybozu/cke:" + cke.Version } fmt.Println("Preparing...") diff --git a/sonobuoy/docker-compose.yml b/sonobuoy/docker-compose.yml index 522ada768..242392d17 100644 --- a/sonobuoy/docker-compose.yml +++ b/sonobuoy/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: cke: container_name: cke - image: quay.io/cybozu/ubuntu:22.04 + image: ghcr.io/cybozu/ubuntu:22.04 networks: app_net: ipv4_address: 172.30.0.11 @@ -19,7 +19,7 @@ services: - --loglevel=debug setup: container_name: setup - image: quay.io/cybozu/ubuntu-debug:22.04 + image: ghcr.io/cybozu/ubuntu-debug:22.04 networks: app_net: ipv4_address: 172.30.0.12 @@ -56,7 +56,7 @@ services: - /entrypoint.sh etcd: container_name: etcd - image: quay.io/cybozu/etcd:3.5 + image: ghcr.io/cybozu/etcd:3.5 networks: app_net: ipv4_address: 172.30.0.14