Skip to content

Commit b543387

Browse files
author
Milla Samuel
committed
Fix test
1 parent 1094584 commit b543387

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

api/v1beta2/foundationdbbackup_types.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,6 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
332332
reconciled = false
333333
}
334334

335-
desiredBackupURL := backup.BackupURL()
336-
if backup.Status.BackupDetails.URL != desiredBackupURL {
337-
backup.Status.Generations.NeedsBackupReconfiguration = backup.Generation
338-
reconciled = false
339-
}
340-
341335
isRunning := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Running
342336
isPaused := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Paused
343337

@@ -362,6 +356,11 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
362356
reconciled = false
363357
}
364358

359+
if isRunning && backup.BackupURL() != backup.Status.BackupDetails.URL {
360+
backup.Status.Generations.NeedsBackupReconfiguration = backup.Generation
361+
reconciled = false
362+
}
363+
365364
if reconciled {
366365
backup.Status.Generations = BackupGenerationStatus{
367366
Reconciled: backup.Generation,

api/v1beta2/foundationdbbackup_types_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ var _ = Describe("[api] FoundationDBBackup", func() {
5252
},
5353
Spec: FoundationDBBackupSpec{
5454
AgentCount: &agentCount,
55+
BlobStoreConfiguration: &BlobStoreConfiguration{
56+
AccountName: "test@test-service",
57+
},
5558
},
5659
Status: FoundationDBBackupStatus{
5760
Generations: BackupGenerationStatus{
@@ -60,7 +63,7 @@ var _ = Describe("[api] FoundationDBBackup", func() {
6063
AgentCount: 3,
6164
DeploymentConfigured: true,
6265
BackupDetails: &FoundationDBBackupStatusBackupDetails{
63-
URL: "blobstore://test@test-service/sample-cluster?bucket=fdb-backups",
66+
URL: "blobstore://test@test-service:443/sample-cluster?bucket=fdb-backups",
6467
Running: true,
6568
SnapshotPeriodSeconds: 864000,
6669
},
@@ -69,7 +72,6 @@ var _ = Describe("[api] FoundationDBBackup", func() {
6972
}
7073

7174
backup = createBackup()
72-
7375
result, err := backup.CheckReconciliation()
7476
Expect(result).To(BeTrue())
7577
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)