Skip to content

Commit 41f1926

Browse files
birsanvbirsanv
authored
Bump open-cluster-management.io/api from 0.11.0 to 0.14.0 (#696)
Signed-off-by: Valentina Birsan <[email protected]>
1 parent de4b081 commit 41f1926

File tree

5 files changed

+117
-236
lines changed

5 files changed

+117
-236
lines changed

‎controllers/create_helper.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package controllers
22

33
import (
44
corev1 "k8s.io/api/core/v1"
5-
v1 "k8s.io/api/core/v1"
65
"k8s.io/apimachinery/pkg/api/resource"
76
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
87

@@ -109,9 +108,9 @@ func createPVC(name string, ns string) *corev1.PersistentVolumeClaim {
109108
AccessModes: []corev1.PersistentVolumeAccessMode{
110109
"ReadWriteOnce",
111110
},
112-
Resources: corev1.ResourceRequirements{
113-
Requests: v1.ResourceList{
114-
v1.ResourceName(v1.ResourceStorage): resource.MustParse("10Gi"),
111+
Resources: corev1.VolumeResourceRequirements{
112+
Requests: corev1.ResourceList{
113+
corev1.ResourceName(corev1.ResourceStorage): resource.MustParse("10Gi"),
115114
},
116115
},
117116
},

‎controllers/suite_test.go

+13-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"path/filepath"
2424
"reflect"
2525
"testing"
26+
"time"
2627

2728
. "github.com/onsi/ginkgo/v2"
2829
. "github.com/onsi/gomega"
@@ -707,6 +708,8 @@ var _ = BeforeSuite(func() {
707708
Expect(err).ToNot(HaveOccurred())
708709

709710
go func() {
711+
712+
defer GinkgoRecover()
710713
err = mgr.Start(ctrl.SetupSignalHandler())
711714
Expect(err).ToNot(HaveOccurred())
712715
}()
@@ -716,7 +719,14 @@ var _ = BeforeSuite(func() {
716719
var _ = AfterSuite(func() {
717720
By("tearing down the test environment")
718721

719-
Expect(testEnv.Stop()).To(Succeed())
720-
Expect(testEnvManagedCluster.Stop()).To(Succeed())
721-
server.Close()
722+
Eventually(func() bool {
723+
err := testEnv.Stop()
724+
return err == nil
725+
}, time.Minute*1, time.Millisecond*250).Should(BeTrue())
726+
727+
Eventually(func() bool {
728+
err := testEnvManagedCluster.Stop()
729+
return err == nil
730+
}, time.Minute*1, time.Millisecond*250).Should(BeTrue())
731+
722732
})

‎go.mod

+30-30
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/robfig/cron/v3 v3.0.1
1313
github.com/vmware-tanzu/velero v1.9.0
14-
go.uber.org/zap v1.24.0
14+
go.uber.org/zap v1.26.0
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.27.2
17-
k8s.io/apimachinery v0.27.2
18-
k8s.io/client-go v0.27.2
19-
open-cluster-management.io/api v0.11.0
16+
k8s.io/api v0.29.1
17+
k8s.io/apimachinery v0.29.1
18+
k8s.io/client-go v0.29.1
19+
open-cluster-management.io/api v0.14.0
2020
open-cluster-management.io/multicloud-operators-channel v0.11.0
21-
sigs.k8s.io/controller-runtime v0.15.1
21+
sigs.k8s.io/controller-runtime v0.17.2
2222
)
2323

2424
require (
2525
github.com/beorn7/perks v1.0.1 // indirect
2626
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
28+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2929
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
30-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
31-
github.com/fsnotify/fsnotify v1.6.0 // indirect
32-
github.com/go-logr/zapr v1.2.4 // indirect
30+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
31+
github.com/fsnotify/fsnotify v1.7.0 // indirect
32+
github.com/go-logr/zapr v1.3.0 // indirect
3333
github.com/go-openapi/jsonpointer v0.19.6 // indirect
34-
github.com/go-openapi/jsonreference v0.20.1 // indirect
34+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3535
github.com/go-openapi/swag v0.22.3 // indirect
3636
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
39-
github.com/golang/protobuf v1.5.3 // indirect
40-
github.com/google/gnostic v0.6.9 // indirect
39+
github.com/golang/protobuf v1.5.4 // indirect
40+
github.com/google/gnostic-models v0.6.8 // indirect
4141
github.com/google/go-cmp v0.6.0 // indirect
4242
github.com/google/gofuzz v1.2.0 // indirect
4343
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
@@ -46,37 +46,37 @@ require (
4646
github.com/josharian/intern v1.0.0 // indirect
4747
github.com/json-iterator/go v1.1.12 // indirect
4848
github.com/mailru/easyjson v0.7.7 // indirect
49-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
49+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5050
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5151
github.com/modern-go/reflect2 v1.0.2 // indirect
5252
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
53-
github.com/prometheus/client_golang v1.15.1 // indirect
54-
github.com/prometheus/client_model v0.4.0 // indirect
55-
github.com/prometheus/common v0.42.0 // indirect
56-
github.com/prometheus/procfs v0.9.0 // indirect
53+
github.com/prometheus/client_golang v1.18.0 // indirect
54+
github.com/prometheus/client_model v0.5.0 // indirect
55+
github.com/prometheus/common v0.45.0 // indirect
56+
github.com/prometheus/procfs v0.12.0 // indirect
5757
github.com/spf13/pflag v1.0.5 // indirect
58-
go.uber.org/atomic v1.9.0 // indirect
59-
go.uber.org/multierr v1.8.0 // indirect
58+
go.uber.org/multierr v1.11.0 // indirect
59+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6060
golang.org/x/net v0.24.0 // indirect
61-
golang.org/x/oauth2 v0.5.0 // indirect
61+
golang.org/x/oauth2 v0.12.0 // indirect
6262
golang.org/x/sys v0.19.0 // indirect
6363
golang.org/x/term v0.19.0 // indirect
6464
golang.org/x/text v0.14.0 // indirect
6565
golang.org/x/time v0.3.0 // indirect
6666
golang.org/x/tools v0.20.0 // indirect
67-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
67+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6868
google.golang.org/appengine v1.6.7 // indirect
6969
google.golang.org/protobuf v1.33.0 // indirect
7070
gopkg.in/inf.v0 v0.9.1 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
72-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
73-
k8s.io/component-base v0.27.2 // indirect
74-
k8s.io/klog/v2 v2.90.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
76-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
72+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
73+
k8s.io/component-base v0.29.1 // indirect
74+
k8s.io/klog/v2 v2.110.1 // indirect
75+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
76+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
7777
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
78-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
79-
sigs.k8s.io/yaml v1.3.0 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
79+
sigs.k8s.io/yaml v1.4.0 // indirect
8080
)
8181

82-
replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.10
82+
replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.10

0 commit comments

Comments
 (0)