Skip to content

Commit

Permalink
Update to controller-runtime v0.13.0
Browse files Browse the repository at this point in the history 
Breaking change:
- kubernetes-sigs/controller-runtime#1917

Signed-off-by: Michail Resvanis <mresvani@redhat.com>
  • Loading branch information
@mresvanis
mresvanis committed Sep 9, 2022
1 parent b56fede commit 58e7ec3
Show file tree
Hide file tree
Showing 207 changed files with 9,042 additions and 2,018 deletions.
36 changes: 18 additions & 18 deletions controllers/deviceconfig_controller_test.go
View file
Expand Up @@ -86,7 +86,7 @@ var _ = Describe("DeviceConfigReconciler", func() {

gomock.InOrder(
c.EXPECT().
Get(ctx, req.NamespacedName, gomock.Any()).
Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).
Return(apierrors.NewNotFound(schema.GroupResource{Resource: "deviceconfigs"}, testDeviceConfigName)),
)
})
Expand All @@ -106,7 +106,7 @@ var _ = Describe("DeviceConfigReconciler", func() {

gomock.InOrder(
c.EXPECT().
Get(ctx, req.NamespacedName, gomock.Any()).
Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).
Return(apierrors.NewServiceUnavailable("Service unavailable")),
)
})
Expand All @@ -127,8 +127,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
r = NewDeviceConfigReconciler(c, s, record.NewFakeRecorder(1), mr, fu, cu, nsv)

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -158,8 +158,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
r = NewDeviceConfigReconciler(c, s, record.NewFakeRecorder(1), mr, fu, cu, nsv)

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -191,8 +191,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
r = NewDeviceConfigReconciler(c, s, record.NewFakeRecorder(1), mr, fu, cu, nsv)

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -243,8 +243,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
Expect(examplecomv1alpha1.AddToScheme(s)).ToNot(HaveOccurred())

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -295,8 +295,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
Expect(kmmv1beta1.AddToScheme(s)).ToNot(HaveOccurred())

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -328,8 +328,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
Expect(kmmv1beta1.AddToScheme(s)).ToNot(HaveOccurred())

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down Expand Up @@ -358,8 +358,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
Expect(kmmv1beta1.AddToScheme(s)).ToNot(HaveOccurred())

gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand All @@ -386,8 +386,8 @@ var _ = Describe("DeviceConfigReconciler", func() {
Context("which does not contain a deletion finalizer", func() {
It("should do nothing", func() {
gomock.InOrder(
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig) error {
c.EXPECT().Get(ctx, req.NamespacedName, gomock.Any(), gomock.Any()).DoAndReturn(
func(_ interface{}, _ interface{}, d *examplecomv1alpha1.DeviceConfig, _ ...interface{}) error {
d.ObjectMeta = dc.ObjectMeta
d.Spec = dc.Spec
return nil
Expand Down
29 changes: 15 additions & 14 deletions go.mod
View file
Expand Up @@ -12,7 +12,7 @@ require (
k8s.io/apimachinery v0.25.0
k8s.io/client-go v0.25.0
k8s.io/klog/v2 v2.80.0
sigs.k8s.io/controller-runtime v0.12.3
sigs.k8s.io/controller-runtime v0.13.0
)

require (
Expand All @@ -26,22 +26,23 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -55,22 +56,22 @@ require (
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/net v0.0.0-20220907135653-1e95f45603a7 // indirect
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/apiextensions-apiserver v0.25.0 // indirect
k8s.io/component-base v0.25.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down

0 comments on commit 58e7ec3

Please sign in to comment.