Merge remote-tracking branch 'origin/master' into nightly

overhangio · Nov 23, 2023 · c4cc727 · c4cc727
2 parents 2b490e5 + 8fdb6f5
commit c4cc727
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/changelog.d/20231023_155558_fghaas_binlog_expiry.md b/changelog.d/20231023_155558_fghaas_binlog_expiry.md
@@ -0,0 +1 @@
+[Improvement] When configured with `RUN_MYSQL: true`, run `mysqld` with binlog expiry set to 3 days (rather than the default of 30).
diff --git a/tutor/templates/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml
@@ -392,7 +392,11 @@ spec:
       containers:
         - name: mysql
           image: {{ DOCKER_IMAGE_MYSQL }}
-          args: ["mysqld", "--character-set-server=utf8mb3", "--collation-server=utf8mb3_general_ci"]
+          args:
+            - "mysqld"
+            - "--character-set-server=utf8mb3"
+            - "--collation-server=utf8mb3_general_ci"
+            - "--binlog-expire-logs-seconds=259200"
           env:
             - name: MYSQL_ROOT_PASSWORD
               value: "{{ MYSQL_ROOT_PASSWORD }}"

diff --git a/tutor/templates/local/docker-compose.yml b/tutor/templates/local/docker-compose.yml
@@ -40,7 +40,11 @@ services:
   {% if RUN_MYSQL -%}
   mysql:
     image: {{ DOCKER_IMAGE_MYSQL }}
-    command: mysqld --character-set-server=utf8mb3 --collation-server=utf8mb3_general_ci
+    command: >
+      mysqld
+      --character-set-server=utf8mb3
+      --collation-server=utf8mb3_general_ci
+      --binlog-expire-logs-seconds=259200
     restart: unless-stopped
     user: "999:999"
     volumes:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[Improvement] When configured with `RUN_MYSQL: true`, run `mysqld` with binlog expiry set to 3 days (rather than the default of 30).