From 0e9cb21fbcc264b16fe46fb05a3bd635af4bd281 Mon Sep 17 00:00:00 2001
From: William Welter <wfelipew@gmail.com>
Date: Thu, 17 Sep 2026 12:21:51 +0100
Subject: [PATCH] Fix a bug in the RDS discovery on the binlog retention period

---
 Makefile                                               |  2 +-
 docs/docker.md                                         |  2 +-
 examples/manifests/mariadb_replication.yaml            |  4 ++--
 .../mariadb_controller_external_repl_init.go           | 10 +++++++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index dd6afda905..82d08957fe 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/docs/docker.md b/docs/docker.md
index 81eac0c5c5..0023f09295 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -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>
diff --git a/examples/manifests/mariadb_replication.yaml b/examples/manifests/mariadb_replication.yaml
index 7379a817ae..9eb55d8eb1 100644
--- a/examples/manifests/mariadb_replication.yaml
+++ b/examples/manifests/mariadb_replication.yaml
@@ -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
diff --git a/internal/controller/mariadb_controller_external_repl_init.go b/internal/controller/mariadb_controller_external_repl_init.go
index 70f55f605c..31d43de08e 100644
--- a/internal/controller/mariadb_controller_external_repl_init.go
+++ b/internal/controller/mariadb_controller_external_repl_init.go
@@ -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 {