From 044e18924dd750f83d3049aaf168dca3c74c27c6 Mon Sep 17 00:00:00 2001 From: ruromero Date: Tue, 14 Apr 2020 12:16:23 +0200 Subject: [PATCH 1/3] Introduce KubernetesResource interface Signed-off-by: ruromero --- pkg/client/interfaces.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/client/interfaces.go b/pkg/client/interfaces.go index 9c96947f81..b2a4c3b1a8 100644 --- a/pkg/client/interfaces.go +++ b/pkg/client/interfaces.go @@ -22,6 +22,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ) @@ -133,3 +134,10 @@ func IgnoreNotFound(err error) error { } return err } + +// KubernetesResource allows functions to work indistinctly with any resource that +// implements both Object interfaces. +type KubernetesResource interface { + metav1.Object + runtime.Object +} From 1d05f237352738172de3fd04c5d1651416a91ee0 Mon Sep 17 00:00:00 2001 From: ruromero Date: Mon, 20 Apr 2020 12:09:07 +0200 Subject: [PATCH 2/3] Rename and move KubernetesObject Signed-off-by: ruromero --- pkg/client/interfaces.go | 8 -------- pkg/controller/controllerutil/controllerutil.go | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/client/interfaces.go b/pkg/client/interfaces.go index b2a4c3b1a8..9c96947f81 100644 --- a/pkg/client/interfaces.go +++ b/pkg/client/interfaces.go @@ -22,7 +22,6 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ) @@ -134,10 +133,3 @@ func IgnoreNotFound(err error) error { } return err } - -// KubernetesResource allows functions to work indistinctly with any resource that -// implements both Object interfaces. -type KubernetesResource interface { - metav1.Object - runtime.Object -} diff --git a/pkg/controller/controllerutil/controllerutil.go b/pkg/controller/controllerutil/controllerutil.go index 767f80deb3..b62fe22a92 100644 --- a/pkg/controller/controllerutil/controllerutil.go +++ b/pkg/controller/controllerutil/controllerutil.go @@ -280,3 +280,10 @@ func RemoveFinalizerWithError(o runtime.Object, finalizer string) error { RemoveFinalizer(m, finalizer) return nil } + +// KubernetesObject allows functions to work indistinctly with any resource that +// implements both Object interfaces. +type KubernetesObject interface { + metav1.Object + runtime.Object +} From ea2e6b128e63d45f78bb8408fbef676efe5c6678 Mon Sep 17 00:00:00 2001 From: ruromero Date: Wed, 6 May 2020 14:56:46 +0200 Subject: [PATCH 3/3] Rename to Object Signed-off-by: ruromero --- pkg/controller/controllerutil/controllerutil.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/controllerutil/controllerutil.go b/pkg/controller/controllerutil/controllerutil.go index b62fe22a92..e460eddbe3 100644 --- a/pkg/controller/controllerutil/controllerutil.go +++ b/pkg/controller/controllerutil/controllerutil.go @@ -281,9 +281,9 @@ func RemoveFinalizerWithError(o runtime.Object, finalizer string) error { return nil } -// KubernetesObject allows functions to work indistinctly with any resource that +// Object allows functions to work indistinctly with any resource that // implements both Object interfaces. -type KubernetesObject interface { +type Object interface { metav1.Object runtime.Object }