Update moco

.github/workflows/weekly.yaml

@@ -17,7 +17,7 @@ jobs:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35"]
+        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35", "8.0.36"]
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -29,7 +29,7 @@ jobs:
     name: Supported Kubernetes versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.35"]
+        mysql-version: ["8.0.36"]
         k8s-version: ["1.27.11", "1.28.7", "1.29.2"]
     runs-on:
       group: moco
@@ -44,7 +44,7 @@ jobs:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35"]
+        mysql-version: ["8.0.18", "8.0.25", "8.0.26", "8.0.27", "8.0.28", "8.0.30", "8.0.31", "8.0.32", "8.0.33", "8.0.34", "8.0.35", "8.0.36"]
         k8s-version: ["1.28.7"]
     runs-on:
       group: moco

Dockerfile

@@ -20,7 +20,7 @@ USER 10000:10000
 ENTRYPOINT ["/moco-controller"]
 
 # For MySQL binaries
-FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.35.1 as mysql
+FROM --platform=$TARGETPLATFORM ghcr.io/cybozu-go/moco/mysql:8.0.36.1 as mysql
 
 # the backup image
 FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu:22.04

containers/fluent-bit/Dockerfile

@@ -3,7 +3,7 @@
 # Stage1: build from source
 FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder
 
-ARG FLUENT_BIT_VERSION=2.2.0
+ARG FLUENT_BIT_VERSION=2.2.2
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

containers/fluent-bit/TAG

@@ -1 +1 @@
-2.2.0.1
+2.2.2.1

containers/mysql/8.0.36/.dockerignore

@@ -0,0 +1 @@
+*

containers/mysql/8.0.36/Dockerfile

@@ -0,0 +1,40 @@
+FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder
+
+ARG MYSQL_VERSION=8.0.36
+
+RUN apt-get update && apt-get -y install --no-install-recommends \
+    cmake \
+    libncurses5-dev \
+    libjemalloc-dev \
+    libnuma-dev \
+    libaio-dev \
+    pkg-config
+
+RUN cd tmp/ \
+    && curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${MYSQL_VERSION}.tar.gz \
+    && tar -x -z -f mysql-boost-${MYSQL_VERSION}.tar.gz \
+    && cd mysql-${MYSQL_VERSION} \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release -DWITH_BOOST=$(ls -d ../boost/boost_*) -DWITH_NUMA=1 -DWITH_JEMALLOC=1 -DWITH_PACKAGE_FLAGS=0 \
+    && make -j 20 \
+    && make install
+
+FROM ghcr.io/cybozu/ubuntu:22.04
+
+COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
+COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
+COPY --from=builder /usr/local/mysql/lib /usr/local/mysql/lib
+COPY --from=builder /usr/local/mysql/share /usr/local/mysql/share
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends libjemalloc2 libnuma1 libaio1 \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /var/lib/mysql \
+  && chown -R 10000:10000 /var/lib/mysql
+
+ENV PATH=/usr/local/mysql/bin:"$PATH"
+VOLUME /var/lib/mysql
+ENTRYPOINT ["mysqld"]
+EXPOSE 3306 33060 33062 8080
+USER 10000:10000

containers/mysql/8.0.36/TAG

@@ -0,0 +1 @@
+8.0.36.1

containers/mysql/8.0.36/container-structure-test.yaml

@@ -0,0 +1,15 @@
+schemaVersion: '2.0.0'
+fileExistenceTests:
+- name: 'mysqld'
+  path: '/usr/local/mysql/bin/mysqld'
+  shouldExist: true
+  isExecutableBy: 'owner'
+- name: 'mysql lib'
+  path: '/usr/local/mysql/lib'
+  shouldExist: true
+- name: 'mysql share'
+  path: '/usr/local/mysql/share'
+  shouldExist: true
+- name: 'mysql LICENSE'
+  path: '/usr/local/mysql/LICENSE'
+  shouldExist: true

containers/mysqld_exporter/Dockerfile

@@ -3,7 +3,7 @@
 # Stage1: build from source
 FROM ghcr.io/cybozu/golang:1.19-jammy AS build
 
-ARG MYSQLD_EXPORTER_VERSION=v0.15.0
+ARG MYSQLD_EXPORTER_VERSION=v0.15.1
 
 RUN git clone -b ${MYSQLD_EXPORTER_VERSION} --depth 1 https://github.com/prometheus/mysqld_exporter \
     && make -C mysqld_exporter build

containers/mysqld_exporter/TAG

@@ -1 +1 @@
-0.15.0.2
+0.15.1.1

e2e/Makefile

@@ -1,7 +1,7 @@
 KIND_VERSION = 0.20.0
-KUBERNETES_VERSION = 1.27.1
+KUBERNETES_VERSION = 1.29.3
 CERT_MANAGER_VERSION = 1.13.2
-MYSQL_VERSION = 8.0.35
+MYSQL_VERSION = 8.0.36
 
 KIND := $(dir $(shell pwd))/bin/kind
 KUBECTL := $(dir $(shell pwd))/bin/kubectl

go.mod

@@ -1,6 +1,6 @@
 module github.com/cybozu-go/moco
 
-go 1.21
+go 1.22.2
 
 require (
 	cloud.google.com/go/storage v1.35.1

version.go

@@ -5,8 +5,8 @@ const (
 	Version = "0.20.2"
 
 	// FluentBitImage is the image for slow-log sidecar container.
-	FluentBitImage = "ghcr.io/cybozu-go/moco/fluent-bit:2.2.0.1"
+	FluentBitImage = "ghcr.io/cybozu-go/moco/fluent-bit:2.2.2.1"
 
 	// ExporterImage is the image for mysqld_exporter sidecar container.
-	ExporterImage = "ghcr.io/cybozu-go/moco/mysqld_exporter:0.15.0.2"
+	ExporterImage = "ghcr.io/cybozu-go/moco/mysqld_exporter:0.15.1.2"
 )