diff --git a/DEVELOP.md b/DEVELOP.md index 776b2acc3..5d024a349 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -58,7 +58,7 @@ Edit the following lines in `Dockerfile`: ``` # The tag should be the latest one -FROM quay.io/cybozu/mysql:8.0.30.1 as mysql +FROM ghcr.io/cybozu-go/moco/mysql:8.0.30.1 as mysql # See the below description for how to get the version string. ARG MYSQLSH_VERSION=8.0.30-1 diff --git a/Dockerfile b/Dockerfile index 24b3124d2..cf1f9a54c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ USER 10000:10000 ENTRYPOINT ["/moco-controller"] # For MySQL binaries -FROM --platform=$TARGETPLATFORM quay.io/cybozu/mysql:8.0.32.1 as mysql +FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.32.1 as mysql # the backup image FROM --platform=$TARGETPLATFORM quay.io/cybozu/ubuntu:20.04 diff --git a/README.md b/README.md index 2eaf041ae..c6db4c99f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/docs/custom-mysqld.md b/docs/custom-mysqld.md index 775a4bedf..d26fc69bd 100644 --- a/docs/custom-mysqld.md +++ b/docs/custom-mysqld.md @@ -1,6 +1,6 @@ # Building custom image of `mysqld` -There are pre-built `mysqld` container images for MOCO on [`quay.io/cybozu/mysql`](https://quay.io/repository/cybozu/mysql?tag=latest&tab=tags). +There are pre-built `mysqld` container images for MOCO on [`ghcr.io/cybozu-go/moco/mysql`](https://github.com/cybozu-go/moco/pkgs/container/moco%2Fmysql). Users can use one of these images to supply `mysqld` container in [MySQLCluster](crd_mysqlcluster.md) like: ```yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 ``` If you want to build and use your own `mysqld`, read the rest of this document. diff --git a/docs/customize-system-container.md b/docs/customize-system-container.md index 02553695d..225d0c10c 100644 --- a/docs/customize-system-container.md +++ b/docs/customize-system-container.md @@ -18,7 +18,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 overwriteContainers: - name: agent resources: diff --git a/docs/designdoc/allow_customize_containers.md b/docs/designdoc/allow_customize_containers.md index 2d01e2fbe..0d6c870a4 100644 --- a/docs/designdoc/allow_customize_containers.md +++ b/docs/designdoc/allow_customize_containers.md @@ -32,7 +32,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 overwriteContainers: - name: agent resources: @@ -95,7 +95,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 overwriteContainers: agent: resources: diff --git a/docs/designdoc/support_reduce_volume_size.md b/docs/designdoc/support_reduce_volume_size.md index 40b20fef7..e790838a1 100644 --- a/docs/designdoc/support_reduce_volume_size.md +++ b/docs/designdoc/support_reduce_volume_size.md @@ -45,7 +45,7 @@ For example, the user modifies the `.spec.volumeClaimTemplates` of the MySQLClus spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/docs/usage.md b/docs/usage.md index 9a3210fe3..1b53bca1a 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -99,7 +99,7 @@ spec: containers: # At least a container named "mysqld" must be defined. - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 # By limiting CPU and memory, Pods will have Guaranteed QoS class. # requests can be omitted; it will be set to the same value as limits. resources: @@ -207,7 +207,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 # must be the same version as the donor + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 # must be the same version as the donor volumeClaimTemplates: - metadata: name: mysql-data @@ -222,7 +222,7 @@ To stop the replication from the donor, update MySQLCluster with `spec.replicati ### Bring your own image -We provide pre-built MySQL container images at [quay.io/cybozu/mysql](http://quay.io/cybozu/mysql). +We provide pre-built MySQL container images at [ghcr.io/cybozu-go/moco/mysql](https://github.com/cybozu-go/moco/pkgs/container/moco%2Fmysql). If you want to build and use your own image, read [`custom-mysqld.md`](custom-mysqld.md). ## Configurations @@ -695,7 +695,7 @@ spec: containers: - name: mysqld # Edit the next line - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 ``` You are advised to make backups and/or create a replica cluster before starting the upgrade process. diff --git a/e2e/mycluster.yaml b/e2e/mycluster.yaml index 391065123..50050024c 100644 --- a/e2e/mycluster.yaml +++ b/e2e/mycluster.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/backup.yaml b/e2e/testdata/backup.yaml index bf2a31263..dfebab319 100644 --- a/e2e/testdata/backup.yaml +++ b/e2e/testdata/backup.yaml @@ -51,7 +51,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/backup_gcs.yaml b/e2e/testdata/backup_gcs.yaml index ed24e0e0b..42a2f4e13 100644 --- a/e2e/testdata/backup_gcs.yaml +++ b/e2e/testdata/backup_gcs.yaml @@ -48,7 +48,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/client.yaml b/e2e/testdata/client.yaml index 0ec66ab21..9327585fa 100644 --- a/e2e/testdata/client.yaml +++ b/e2e/testdata/client.yaml @@ -7,5 +7,5 @@ metadata: spec: containers: - name: pause - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} command: ["pause"] diff --git a/e2e/testdata/donor.yaml b/e2e/testdata/donor.yaml index a3597c635..eec6b13b9 100644 --- a/e2e/testdata/donor.yaml +++ b/e2e/testdata/donor.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/failover.yaml b/e2e/testdata/failover.yaml index b9666ad33..43c07301f 100644 --- a/e2e/testdata/failover.yaml +++ b/e2e/testdata/failover.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/failure.yaml b/e2e/testdata/failure.yaml index 4e86269f9..47b1eecda 100644 --- a/e2e/testdata/failure.yaml +++ b/e2e/testdata/failure.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/pvc_test.yaml b/e2e/testdata/pvc_test.yaml index 20739d164..19092422e 100644 --- a/e2e/testdata/pvc_test.yaml +++ b/e2e/testdata/pvc_test.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/pvc_test_changed.yaml b/e2e/testdata/pvc_test_changed.yaml index e6494a21c..d12ae4dbc 100644 --- a/e2e/testdata/pvc_test_changed.yaml +++ b/e2e/testdata/pvc_test_changed.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/replication.yaml b/e2e/testdata/replication.yaml index fa236647d..aa0fd47c5 100644 --- a/e2e/testdata/replication.yaml +++ b/e2e/testdata/replication.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/restore.yaml b/e2e/testdata/restore.yaml index 8a0d9f03e..019f5c05c 100644 --- a/e2e/testdata/restore.yaml +++ b/e2e/testdata/restore.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ .MySQLVersion }} + image: ghcr.io/cybozu-go/moco/mysql:{{ .MySQLVersion }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/restore_gcs.yaml b/e2e/testdata/restore_gcs.yaml index 62a56c28f..11cbd6fc9 100644 --- a/e2e/testdata/restore_gcs.yaml +++ b/e2e/testdata/restore_gcs.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ .MySQLVersion }} + image: ghcr.io/cybozu-go/moco/mysql:{{ .MySQLVersion }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/e2e/testdata/single.yaml b/e2e/testdata/single.yaml index 4b05ff142..088f3a4e8 100644 --- a/e2e/testdata/single.yaml +++ b/e2e/testdata/single.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} resources: limits: cpu: "0.5" diff --git a/e2e/testdata/upgrade.yaml b/e2e/testdata/upgrade.yaml index 5a586713f..3eaa87990 100644 --- a/e2e/testdata/upgrade.yaml +++ b/e2e/testdata/upgrade.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:{{ . }} + image: ghcr.io/cybozu-go/moco/mysql:{{ . }} volumeClaimTemplates: - metadata: name: mysql-data diff --git a/examples/anti-affinity.yaml b/examples/anti-affinity.yaml index 6345328fc..54bcafa01 100644 --- a/examples/anti-affinity.yaml +++ b/examples/anti-affinity.yaml @@ -26,7 +26,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 resources: requests: cpu: "10" diff --git a/examples/collect-metrics.yaml b/examples/collect-metrics.yaml index 52eae4115..e93941ed0 100644 --- a/examples/collect-metrics.yaml +++ b/examples/collect-metrics.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/examples/custom-mycnf.yaml b/examples/custom-mycnf.yaml index 4d3db2a1e..60c93cce5 100644 --- a/examples/custom-mycnf.yaml +++ b/examples/custom-mycnf.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/examples/custom-probe.yaml b/examples/custom-probe.yaml index af2c620c4..3415b4da3 100644 --- a/examples/custom-probe.yaml +++ b/examples/custom-probe.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 # If you want to override the default probes, you cannot override the httpGet. livenessProbe: failureThreshold: 3 diff --git a/examples/guaranteed.yaml b/examples/guaranteed.yaml index 597e386ae..4ec223d2d 100644 --- a/examples/guaranteed.yaml +++ b/examples/guaranteed.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 # By limiting CPU and memory, Pods will have Guaranteed QoS class. # requests can be omitted; it will be set to the same value as limits. resources: diff --git a/examples/loadbalancer.yaml b/examples/loadbalancer.yaml index adb3579c6..041d22523 100644 --- a/examples/loadbalancer.yaml +++ b/examples/loadbalancer.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: mysqld - image: quay.io/cybozu/mysql:8.0.30 + image: ghcr.io/cybozu-go/moco/mysql:8.0.30 volumeClaimTemplates: - metadata: name: mysql-data diff --git a/version.go b/version.go index 74ea587fd..37a1a2600 100644 --- a/version.go +++ b/version.go @@ -5,8 +5,8 @@ const ( Version = "0.16.1" // FluentBitImage is the image for slow-log sidecar container. - FluentBitImage = "quay.io/cybozu/fluent-bit:2.0.9.1" + FluentBitImage = "ghcr.io/cybozu-go/moco/fluent-bit:2.0.9.1" // ExporterImage is the image for mysqld_exporter sidecar container. - ExporterImage = "quay.io/cybozu/mysqld_exporter:0.14.0.4" + ExporterImage = "ghcr.io/cybozu-go/moco/mysqld_exporter:0.14.0.1" )