Skip to content

Commit 0f71138

Browse files
committed
better s3 secret update
Signed-off-by: Andrey Kolkov <[email protected]>
1 parent e2eea18 commit 0f71138

1 file changed

Lines changed: 38 additions & 10 deletions

File tree

‎internal/backupcontroller/velerostrategy_controller.go‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,17 +334,45 @@ s3 =
334334
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "SecretCreated",
335335
fmt.Sprintf("Created Velero credentials secret %s/%s", secretNamespace, secretName))
336336
} else if err == nil {
337-
// Update if necessary
338-
foundSecret.StringData = secret.StringData
339-
foundSecret.Data = nil // Clear .Data so .StringData will be used
340-
if err := r.Update(ctx, foundSecret); err != nil {
341-
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "SecretUpdateFailed",
342-
fmt.Sprintf("Failed to update Velero credentials secret %s/%s: %v", secretNamespace, secretName, err))
343-
return fmt.Errorf("failed to update Velero credentials secret: %w", err)
337+
// Update if necessary - only update if the secret data has actually changed
338+
// Compare the new secret data with existing secret data
339+
existingData := foundSecret.Data
340+
if existingData == nil {
341+
existingData = make(map[string][]byte)
342+
}
343+
newData := make(map[string][]byte)
344+
for k, v := range secret.StringData {
345+
newData[k] = []byte(v)
346+
}
347+
348+
// Check if data has changed
349+
dataChanged := false
350+
if len(existingData) != len(newData) {
351+
dataChanged = true
352+
} else {
353+
for k, newVal := range newData {
354+
existingVal, exists := existingData[k]
355+
if !exists || !reflect.DeepEqual(existingVal, newVal) {
356+
dataChanged = true
357+
break
358+
}
359+
}
360+
}
361+
362+
if dataChanged {
363+
foundSecret.StringData = secret.StringData
364+
foundSecret.Data = nil // Clear .Data so .StringData will be used
365+
if err := r.Update(ctx, foundSecret); err != nil {
366+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "SecretUpdateFailed",
367+
fmt.Sprintf("Failed to update Velero credentials secret %s/%s: %v", secretNamespace, secretName, err))
368+
return fmt.Errorf("failed to update Velero credentials secret: %w", err)
369+
}
370+
logger.Info("updated Velero credentials secret", "secret", secretName)
371+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "SecretUpdated",
372+
fmt.Sprintf("Updated Velero credentials secret %s/%s", secretNamespace, secretName))
373+
} else {
374+
logger.V(1).Info("Velero credentials secret data unchanged, skipping update", "secret", secretName)
344375
}
345-
logger.Info("updated Velero credentials secret", "secret", secretName)
346-
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "SecretUpdated",
347-
fmt.Sprintf("Updated Velero credentials secret %s/%s", secretNamespace, secretName))
348376
} else if err != nil {
349377
return fmt.Errorf("error checking for existing Velero credentials secret: %w", err)
350378
}

0 commit comments

Comments
 (0)