Skip to content

Commit 3ea7ff7

Browse files
gkechgkech
authored
Merge pull request #1105 from percona/dependabot/go_modules/sigs.k8s.io/controller-runtime-0.20.4
CLOUD-727: Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4
2 parents 4953b04 + d634cec commit 3ea7ff7

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
k8s.io/apimachinery v0.32.3
3838
k8s.io/client-go v0.32.3
3939
k8s.io/component-base v0.32.3
40-
sigs.k8s.io/controller-runtime v0.20.3
40+
sigs.k8s.io/controller-runtime v0.20.4
4141
sigs.k8s.io/yaml v1.4.0
4242
)
4343

@@ -127,7 +127,7 @@ require (
127127
google.golang.org/protobuf v1.36.5 // indirect
128128
gopkg.in/inf.v0 v0.9.1 // indirect
129129
gopkg.in/yaml.v3 v3.0.1 // indirect
130-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
130+
k8s.io/apiextensions-apiserver v0.32.1
131131
k8s.io/klog/v2 v2.130.1 // indirect
132132
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
133133
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
408408
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
409409
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
410410
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
411-
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
412-
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
411+
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
412+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
413413
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
414414
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
415415
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎internal/controller/postgrescluster/helpers_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ func testCluster() *v1beta1.PostgresCluster {
141141
return cluster.DeepCopy()
142142
}
143143

144-
func testBackupJob(cluster *v1beta1.PostgresCluster) *batchv1.Job {
144+
func testBackupJob(cluster *v1beta1.PostgresCluster, name string) *batchv1.Job {
145145
job := batchv1.Job{
146146
TypeMeta: metav1.TypeMeta{
147147
APIVersion: batchv1.SchemeGroupVersion.String(),
148148
Kind: "Job",
149149
},
150150
ObjectMeta: metav1.ObjectMeta{
151-
Name: "backup-job-1",
151+
Name: name,
152152
Namespace: cluster.Namespace,
153153
Labels: map[string]string{
154154
naming.LabelCluster: cluster.Name,

‎internal/controller/postgrescluster/snapshots_test.go

+11-13
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ func TestReconcileDedicatedSnapshotVolume(t *testing.T) {
493493
t.Cleanup(func() { assert.Check(t, r.Client.Delete(ctx, cluster)) })
494494

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

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

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

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

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

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

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

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

977-
job2 := testBackupJob(cluster)
977+
job2 := testBackupJob(cluster, "backup-job-one-complete-2")
978978
job2.Namespace = ns.Name
979-
job2.Name = "backup-job-2"
980979

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

10111010
latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
10121011
assert.NilError(t, err)
1013-
assert.Check(t, latestCompleteBackupJob.Name == "backup-job-1")
1012+
assert.Equal(t, latestCompleteBackupJob.Name, "backup-job-one-complete-1")
10141013
})
10151014

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

1021-
job1 := testBackupJob(cluster)
1020+
job1 := testBackupJob(cluster, "backup-job-two-complete-1")
10221021
job1.Namespace = ns.Name
10231022

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

1027-
job2 := testBackupJob(cluster)
1026+
job2 := testBackupJob(cluster, "backup-job-two-complete-2")
10281027
job2.Namespace = ns.Name
1029-
job2.Name = "backup-job-2"
10301028

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

10881086
latestCompleteBackupJob, err := r.getLatestCompleteBackupJob(ctx, cluster)
10891087
assert.NilError(t, err)
1090-
assert.Check(t, latestCompleteBackupJob.Name == "backup-job-1")
1088+
assert.Equal(t, latestCompleteBackupJob.Name, "backup-job-one-complete-1")
10911089
})
10921090
}
10931091

0 commit comments

Comments
 (0)