Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
masa213f committed Dec 4, 2023
1 parent f1148e0 commit 232299c
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
--------
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/design.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mtest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mtest/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion mtest/node-ign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mtest/reboot-alittleslow-eviction-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mtest/reboot-job-completed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mtest/reboot-job-running.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion mtest/reboot-slow-eviction-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mtest/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand Down
6 changes: 3 additions & 3 deletions sonobuoy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 232299c

Please sign in to comment.