Skip to content

Commit

Permalink
Use ghcr.io images
Browse files Browse the repository at this point in the history
Signed-off-by: d-kuro <kurosawa7620@gmail.com>
  • Loading branch information
d-kuro committed Jul 19, 2023
1 parent 47f077f commit 1d6ae3a
Show file tree
Hide file tree
Showing 29 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/custom-mysqld.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/customize-system-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/designdoc/allow_customize_containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/designdoc/support_reduce_volume_size.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion e2e/mycluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/backup_gcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ metadata:
spec:
containers:
- name: pause
image: quay.io/cybozu/mysql:{{ . }}
image: ghcr.io/cybozu-go/moco/mysql:{{ . }}
command: ["pause"]
2 changes: 1 addition & 1 deletion e2e/testdata/donor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/failure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/pvc_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/pvc_test_changed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/replication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/restore_gcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/single.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion e2e/testdata/upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/anti-affinity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/collect-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-mycnf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-probe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/guaranteed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/loadbalancer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

0 comments on commit 1d6ae3a

Please sign in to comment.