Skip to content

CLOUD-727: Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4 #1105

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
merged 9 commits into from
Apr 8, 2025
Merged

CLOUD-727: Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1322715
CLOUD-727: Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4
dependabot[bot] Apr 2, 2025
f7eda7d
fix test
gkech Apr 8, 2025
391c05c
Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller…
gkech Apr 8, 2025
6f20c37
fix assertions
gkech Apr 8, 2025
40b34ce
fix one more assertions
gkech Apr 8, 2025
afd0441
Merge branch 'main' into dependabot/go_modules/sigs.k8s.io/controller…
hors Apr 8, 2025
11218bd
assertions
gkech Apr 8, 2025
8158afa
assert equal
gkech Apr 8, 2025
d634cec
fix assertions
gkech Apr 8, 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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
k8s.io/component-base v0.32.3
sigs.k8s.io/controller-runtime v0.20.3
sigs.k8s.io/controller-runtime v0.20.4
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -127,7 +127,7 @@ require (
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.32.1 // indirect
k8s.io/apiextensions-apiserver v0.32.1
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/postgrescluster/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@ func testCluster() *v1beta1.PostgresCluster {
return cluster.DeepCopy()
}

func testBackupJob(cluster *v1beta1.PostgresCluster) *batchv1.Job {
func testBackupJob(cluster *v1beta1.PostgresCluster, name string) *batchv1.Job {
job := batchv1.Job{
TypeMeta: metav1.TypeMeta{
APIVersion: batchv1.SchemeGroupVersion.String(),
Kind: "Job",
},
ObjectMeta: metav1.ObjectMeta{
Name: "backup-job-1",
Name: name,
Namespace: cluster.Namespace,
Labels: map[string]string{
naming.LabelCluster: cluster.Name,
Expand Down
24 changes: 11 additions & 13 deletions internal/controller/postgrescluster/snapshots_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
t.Cleanup(func() { assert.Check(t, r.Client.Delete(ctx, cluster)) })

// Create successful backup job
backupJob := testBackupJob(cluster)
backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-1")
err = errors.WithStack(r.setControllerReference(cluster, backupJob))
assert.NilError(t, err)
err = r.apply(ctx, backupJob)
Expand Down Expand Up @@ -562,7 +562,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))

// Create successful backup job
backupJob := testBackupJob(cluster)
backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-exists-1")
err = errors.WithStack(r.setControllerReference(cluster, backupJob))
assert.NilError(t, err)
err = r.apply(ctx, backupJob)
Expand Down Expand Up @@ -665,7 +665,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))

// Create successful backup job
backupJob := testBackupJob(cluster)
backupJob := testBackupJob(cluster, "backup-job-snapshots-enabled-failed-exists-1")
err = errors.WithStack(r.setControllerReference(cluster, backupJob))
assert.NilError(t, err)
err = r.apply(ctx, backupJob)
Expand Down Expand Up @@ -796,7 +796,7 @@ func TestDedicatedSnapshotVolumeRestore(t *testing.T) {
sts := &appsv1.StatefulSet{}
generateInstanceStatefulSetIntent(ctx, cluster, &cluster.Spec.InstanceSets[0], "pod-service", "service-account", sts, 1)
currentTime := metav1.Now()
backupJob := testBackupJob(cluster)
backupJob := testBackupJob(cluster, "backup-job-dedicated-snapshot-exists-1")
backupJob.Status.CompletionTime = &currentTime

err := r.dedicatedSnapshotVolumeRestore(ctx, cluster, pvc, backupJob)
Expand Down Expand Up @@ -954,7 +954,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
})

t.Run("NoCompleteJobs", func(t *testing.T) {
job1 := testBackupJob(cluster)
job1 := testBackupJob(cluster, "backup-job-latest-complete-1")
job1.Namespace = ns.Name

err := r.apply(ctx, job1)
Expand All @@ -968,15 +968,14 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {
t.Run("OneCompleteBackupJob", func(t *testing.T) {
currentTime := metav1.Now()

job1 := testBackupJob(cluster)
job1 := testBackupJob(cluster, "backup-job-one-complete-1")
job1.Namespace = ns.Name

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

job2 := testBackupJob(cluster)
job2 := testBackupJob(cluster, "backup-job-one-complete-2")
job2.Namespace = ns.Name
job2.Name = "backup-job-2"

err = r.apply(ctx, job2)
assert.NilError(t, err)
Expand Down Expand Up @@ -1010,23 +1009,22 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {

latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
assert.NilError(t, err)
assert.Check(t, latestCompleteBackupJob.Name == "backup-job-1")
assert.Equal(t, latestCompleteBackupJob.Name, "backup-job-one-complete-1")
})

t.Run("TwoCompleteBackupJobs", func(t *testing.T) {
currentTime := metav1.Now()
earlierTime := metav1.NewTime(currentTime.AddDate(-1, 0, 0))
assert.Check(t, earlierTime.Before(&currentTime))

job1 := testBackupJob(cluster)
job1 := testBackupJob(cluster, "backup-job-two-complete-1")
job1.Namespace = ns.Name

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

job2 := testBackupJob(cluster)
job2 := testBackupJob(cluster, "backup-job-two-complete-2")
job2.Namespace = ns.Name
job2.Name = "backup-job-2"

err = r.apply(ctx, job2)
assert.NilError(t, err)
Expand Down Expand Up @@ -1087,7 +1085,7 @@ func TestGetLatestCompleteBackupJob(t *testing.T) {

latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
assert.NilError(t, err)
assert.Check(t, latestCompleteBackupJob.Name == "backup-job-1")
assert.Equal(t, latestCompleteBackupJob.Name, "backup-job-one-complete-1")
})
}

Expand Down
Loading