pass scheduled backup name to make sure its patched correctly

tembo-io · Sep 26, 2024 · 7fc1136 · 7fc1136
1 parent 80079ce
commit 7fc1136
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tembo-operator/src/cloudnativepg/cnpg_utils.rs b/tembo-operator/src/cloudnativepg/cnpg_utils.rs
@@ -156,6 +156,7 @@ pub async fn patch_cluster_merge(
 pub async fn patch_scheduled_backup_merge(
     cdb: &CoreDB,
     ctx: &Arc<Context>,
+    backup_name: &str,
     patch: serde_json::Value,
 ) -> Result<(), Action> {
     let name = cdb.name_any();
@@ -167,7 +168,7 @@ pub async fn patch_scheduled_backup_merge(
     let scheduled_backup_api: Api<ScheduledBackup> = Api::namespaced(ctx.client.clone(), namespace);
     let pp = PatchParams::apply("patch_merge");
     let _ = scheduled_backup_api
-        .patch(&name, &pp, &Patch::Merge(&patch))
+        .patch(backup_name, &pp, &Patch::Merge(&patch))
         .await
         .map_err(|e| {
             error!("Error patching cluster: {}", e);

diff --git a/tembo-operator/src/cloudnativepg/hibernate.rs b/tembo-operator/src/cloudnativepg/hibernate.rs
@@ -283,6 +283,7 @@ async fn update_scheduled_backups(
     let scheduled_backup_value = cdb.spec.stop;
 
     for sb in scheduled_backups {
+        let scheduled_backup_name = sb.metadata.name.as_deref().unwrap_or(&name);
         let scheduled_backup_suspend_status = sb.spec.suspend.unwrap_or_default();
 
         if scheduled_backup_suspend_status != scheduled_backup_value {
@@ -292,7 +293,14 @@ async fn update_scheduled_backups(
                 }
             });
 
-            match patch_scheduled_backup_merge(cdb, ctx, patch_scheduled_backup_spec).await {
+            match patch_scheduled_backup_merge(
+                cdb,
+                ctx,
+                scheduled_backup_name,
+                patch_scheduled_backup_spec,
+            )
+            .await
+            {
                 Ok(_) => {
                     info!(
                         "Toggled scheduled backup suspend of {} to '{}'",