Use ghcr containers for test

Signed-off-by: Masayuki Ishii <[email protected]>
cybozu-go · Dec 7, 2023 · f16cdf8 · f16cdf8
1 parent e0b5117
commit f16cdf8
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git 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/httpd.yml b/mtest/httpd.yml
@@ -7,5 +7,5 @@ metadata:
 spec:
   containers:
     - name: httpd
-      image: quay.io/cybozu/testhttpd:0
+      image: ghcr.io/cybozu/testhttpd:0
   hostNetwork: true
diff --git 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/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-deployment.yaml b/mtest/reboot-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: httpd
-          image: quay.io/cybozu/testhttpd:0
+          image: ghcr.io/cybozu/testhttpd:0
 ---
 apiVersion: policy/v1
 kind: PodDisruptionBudget

diff --git 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
@@ -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
@@ -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/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