Skip to content

Fix a bug in the RDS discovery on the binlog retention period #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wfelipew merged 1 commit into from
Sep 17, 2026
Merged

Fix a bug in the RDS discovery on the binlog retention period #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ endif
SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

VERSION ?= 26.6.0-bandwidth.6
VERSION ?= 26.6.0-bandwidth.7

# mariadb-operator
IMG_NAME ?= ghcr.io/mariadb-operator/mariadb-operator
Expand Down
2 changes: 1 addition & 1 deletion docs/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</tr>
<tr>
<td>MariaDB Operator</td>
<td><code>ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.6</code></td>
<td><code>ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.7</code></td>
<td><code>amd64</code> <code>arm64</code></td>
</tr>
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions examples/manifests/mariadb_replication.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ spec:
# syncBinlog: 1
# Init container that cooperates with mariadb-operator.
# initContainer:
# image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.6
# image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.7
# Agent sidecar that cooperates with mariadb-operator.
# agent:
# image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.6
# image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.7

service:
type: LoadBalancer
Expand Down
10 changes: 7 additions & 3 deletions internal/controller/mariadb_controller_external_repl_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,16 @@ func getBinlogExpireLogsDuration(emdb *mariadbv1alpha1.ExternalMariaDB, ctx cont
isRDS := false

// Check if it is an RDS instance
if user_exist, err := external_client.UserExists(ctx, "rdsadmin", "localhost"); err != nil && user_exist {
if table_exists, err := external_client.TableExists(ctx, "mysql", "rds_configuration"); err != nil && table_exists {
if user_exist, err := external_client.UserExists(ctx, "rdsadmin", "localhost"); err == nil && user_exist {
if table_exists, err := external_client.TableExists(ctx, "mysql", "rds_configuration"); err == nil && table_exists {
logger.Info("RDS config found")
isRDS = true
}
logger.Info("AWS user detected")
logger.Info("RDS user detected")
} else {
if err != nil {
logger.Info("Error querying external server for RDS discovery", "error", err)
}
}

if isRDS {
Expand Down
Loading