Skip to content

Updating Snapshot test to fix update errors #4160

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caitlinstrong merged 4 commits into from
Apr 30, 2025
Merged

Updating Snapshot test to fix update errors #4160

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a71a5e
r.Client.Create test
caitlinstrong Apr 15, 2025
71c78a9
Reverting back to where the test is currently failing
caitlinstrong Apr 21, 2025
4f740fc
Reverting back to r.apply in two more places where the test is failing
caitlinstrong Apr 21, 2025
7a30c31
Merge branch 'CrunchyData:main' into snapshot-test
caitlinstrong Apr 25, 2025
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
36 changes: 18 additions & 18 deletions internal/controller/postgrescluster/snapshots_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
volumeSnapshotClassName := "my-snapshotclass"
snapshot, err := r.generateVolumeSnapshot(cluster, *pvc, volumeSnapshotClassName)
assert.NilError(t, err)
assert.NilError(t, r.apply(ctx, snapshot))
assert.NilError(t, r.Client.Create(ctx, snapshot))

// Get all snapshots for this cluster and assert 1 exists
selectSnapshots, err := naming.AsSelector(naming.Cluster(cluster.Name))
Expand Down Expand Up @@ -235,7 +235,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
},
}
assert.NilError(t, r.setControllerReference(cluster, snapshot1))
assert.NilError(t, r.apply(ctx, snapshot1))
assert.NilError(t, r.Client.Create(ctx, snapshot1))

// Update snapshot status
truePtr := initialize.Bool(true)
Expand Down Expand Up @@ -267,7 +267,7 @@ func TestReconcileVolumeSnapshots(t *testing.T) {
},
}
assert.NilError(t, r.setControllerReference(cluster, snapshot2))
assert.NilError(t, r.apply(ctx, snapshot2))
assert.NilError(t, r.Client.Create(ctx, snapshot2))

// Update second snapshot's status
snapshot2.Status = &volumesnapshotv1.VolumeSnapshotStatus{
Expand Down Expand Up @@ -391,7 +391,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
spec := testVolumeClaimSpec()
pvc.Spec = spec.AsPersistentVolumeClaimSpec()
assert.NilError(t, r.setControllerReference(cluster, pvc))
assert.NilError(t, r.apply(ctx, pvc))
assert.NilError(t, r.Client.Create(ctx, pvc))

// Assert that the pvc was created
selectPvcs, err := naming.AsSelector(naming.Cluster(cluster.Name))
Expand Down Expand Up @@ -468,7 +468,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
// Create successful backup job
backupJob := testBackupJob(cluster)
assert.NilError(t, r.setControllerReference(cluster, backupJob))
assert.NilError(t, r.apply(ctx, backupJob))
assert.NilError(t, r.Client.Create(ctx, backupJob))

currentTime := metav1.Now()
startTime := metav1.NewTime(currentTime.AddDate(0, 0, -1))
Expand Down Expand Up @@ -519,7 +519,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
// Create successful backup job
backupJob := testBackupJob(cluster)
assert.NilError(t, r.setControllerReference(cluster, backupJob))
assert.NilError(t, r.apply(ctx, backupJob))
assert.NilError(t, r.Client.Create(ctx, backupJob))

backupJob.Status = succeededJobStatus(earlierStartTime, earlierTime)
assert.NilError(t, r.Client.Status().Update(ctx, backupJob))
Expand All @@ -530,7 +530,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
naming.PGBackRestBackupJobCompletion: backupJob.Status.CompletionTime.Format(time.RFC3339),
}
assert.NilError(t, r.setControllerReference(cluster, restoreJob))
assert.NilError(t, r.apply(ctx, restoreJob))
assert.NilError(t, r.Client.Create(ctx, restoreJob))

restoreJob.Status = succeededJobStatus(currentStartTime, currentTime)
assert.NilError(t, r.Client.Status().Update(ctx, restoreJob))
Expand Down Expand Up @@ -580,7 +580,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
// Create successful backup job
backupJob := testBackupJob(cluster)
assert.NilError(t, r.setControllerReference(cluster, backupJob))
assert.NilError(t, r.apply(ctx, backupJob))
assert.NilError(t, r.Client.Create(ctx, backupJob))

backupJob.Status = succeededJobStatus(startTime, earlierTime)
assert.NilError(t, r.Client.Status().Update(ctx, backupJob))
Expand All @@ -591,7 +591,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
naming.PGBackRestBackupJobCompletion: backupJob.Status.CompletionTime.Format(time.RFC3339),
}
assert.NilError(t, r.setControllerReference(cluster, restoreJob))
assert.NilError(t, r.apply(ctx, restoreJob))
assert.NilError(t, r.Client.Create(ctx, restoreJob))

restoreJob.Status = batchv1.JobStatus{
Succeeded: 0,
Expand Down Expand Up @@ -773,7 +773,7 @@ func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) {
job1 := testRestoreJob(cluster)
job1.Namespace = ns.Name

err := r.apply(ctx, job1)
err := r.Client.Create(ctx, job1)
assert.NilError(t, err)

dsvRestoreJob, err := r.getDedicatedSnapshotVolumeRestoreJob(ctx, cluster)
Expand All @@ -789,14 +789,14 @@ func TestGetDedicatedSnapshotVolumeRestoreJob(t *testing.T) {
naming.PGBackRestBackupJobCompletion: "backup-timestamp",
}

err := r.apply(ctx, job2)
err := r.Client.Create(ctx, job2)
assert.NilError(t, err)

job3 := testRestoreJob(cluster)
job3.Name = "restore-job-3"
job3.Namespace = ns.Name

assert.NilError(t, r.apply(ctx, job3))
assert.NilError(t, r.Client.Create(ctx, job3))

dsvRestoreJob, err := r.getDedicatedSnapshotVolumeRestoreJob(ctx, cluster)
assert.NilError(t, err)
Expand Down Expand Up @@ -828,7 +828,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
job1 := testBackupJob(cluster)
job1.Namespace = ns.Name

err := r.apply(ctx, job1)
err := r.Client.Create(ctx, job1)
assert.NilError(t, err)

latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
Expand All @@ -850,7 +850,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
job2.Namespace = ns.Name
job2.Name = "backup-job-2"

assert.NilError(t, r.apply(ctx, job2))
assert.NilError(t, r.Client.Create(ctx, job2))

// Get job1 and update Status.
assert.NilError(t, r.Client.Get(ctx, client.ObjectKeyFromObject(job1), job1))
Expand Down Expand Up @@ -1034,7 +1034,7 @@ func TestGetSnapshotsForCluster(t *testing.T) {
}
snapshot.Spec.Source.PersistentVolumeClaimName = initialize.String("some-pvc-name")
snapshot.Spec.VolumeSnapshotClassName = initialize.String("some-class-name")
assert.NilError(t, r.apply(ctx, snapshot))
assert.NilError(t, r.Client.Create(ctx, snapshot))

snapshots, err := r.getSnapshotsForCluster(ctx, cluster)
assert.NilError(t, err)
Expand Down Expand Up @@ -1075,7 +1075,7 @@ func TestGetSnapshotsForCluster(t *testing.T) {
}
snapshot2.Spec.Source.PersistentVolumeClaimName = initialize.String("another-pvc-name")
snapshot2.Spec.VolumeSnapshotClassName = initialize.String("another-class-name")
assert.NilError(t, r.apply(ctx, snapshot2))
assert.NilError(t, r.Client.Create(ctx, snapshot2))

snapshots, err := r.getSnapshotsForCluster(ctx, cluster)
assert.NilError(t, err)
Expand Down Expand Up @@ -1267,7 +1267,7 @@ func TestDeleteSnapshots(t *testing.T) {
},
}
assert.NilError(t, r.setControllerReference(rhinoCluster, snapshot1))
assert.NilError(t, r.apply(ctx, snapshot1))
assert.NilError(t, r.Client.Create(ctx, snapshot1))

snapshots := []*volumesnapshotv1.VolumeSnapshot{
snapshot1,
Expand Down Expand Up @@ -1317,7 +1317,7 @@ func TestDeleteSnapshots(t *testing.T) {
},
}
assert.NilError(t, r.setControllerReference(cluster, snapshot2))
assert.NilError(t, r.apply(ctx, snapshot2))
assert.NilError(t, r.Client.Create(ctx, snapshot2))

snapshots := []*volumesnapshotv1.VolumeSnapshot{
snapshot1, snapshot2,
Expand Down
Loading