Merge pull request #397 from darkowlzz/rm-util-objectkey

Remove old util ObjectKey
fluxcd · Aug 1, 2021 · 81a4090 · 81a4090
2 parents 9d66fc7 + 930e7d3
commit 81a4090
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/controllers/kustomization_controller_gc_test.go b/controllers/kustomization_controller_gc_test.go
@@ -138,7 +138,7 @@ data:
 
 			var got kustomizev1.Kustomization
 			Eventually(func() bool {
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &got)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &got)
 				c := apimeta.FindStatusCondition(got.Status.Conditions, meta.ReadyCondition)
 				return c != nil && c.Reason == meta.ReconciliationSucceededReason
 			}, timeout, time.Second).Should(BeTrue())
@@ -158,7 +158,7 @@ data:
 			Expect(k8sClient.Status().Update(context.Background(), gitRepo)).To(Succeed())
 
 			Eventually(func() bool {
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &got)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &got)
 				return got.Status.LastAppliedRevision == gitRepo.Status.Artifact.Revision
 			}, timeout, time.Second).Should(BeTrue())
 			err = k8sClient.Get(context.Background(), client.ObjectKey{Name: "first", Namespace: namespace.Name}, &configMap)
@@ -204,7 +204,7 @@ data:
 
 			var got kustomizev1.Kustomization
 			Eventually(func() bool {
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &got)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &got)
 				c := apimeta.FindStatusCondition(got.Status.Conditions, meta.ReadyCondition)
 				return c != nil && c.Reason == meta.ReconciliationSucceededReason
 			}, timeout, time.Second).Should(BeTrue())
@@ -224,7 +224,7 @@ data:
 			Expect(k8sClient.Status().Update(context.Background(), gitRepo)).To(Succeed())
 
 			Eventually(func() bool {
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &got)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &got)
 				return got.Status.LastAppliedRevision == gitRepo.Status.Artifact.Revision
 			}, timeout, time.Second).Should(BeTrue())
 			err = k8sClient.Get(context.Background(), client.ObjectKey{Name: "first", Namespace: namespace.Name}, &configMap)

diff --git a/controllers/kustomization_controller_patch_test.go b/controllers/kustomization_controller_patch_test.go
@@ -135,7 +135,7 @@ var _ = Describe("KustomizationReconciler", func() {
 
 			Eventually(func() bool {
 				var obj kustomizev1.Kustomization
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &obj)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &obj)
 				return obj.Status.LastAppliedRevision == "main/"+artifactChecksum
 			}, timeout, time.Second).Should(BeTrue())
 
@@ -161,7 +161,7 @@ var _ = Describe("KustomizationReconciler", func() {
 
 			Eventually(func() bool {
 				var obj kustomizev1.Kustomization
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &obj)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &obj)
 				return obj.Status.LastAppliedRevision == "main/"+artifactChecksum
 			}, timeout, time.Second).Should(BeTrue())
 
@@ -187,7 +187,7 @@ metadata:
 
 			Eventually(func() bool {
 				var obj kustomizev1.Kustomization
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &obj)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &obj)
 				return obj.Status.LastAppliedRevision == "main/"+artifactChecksum
 			}, timeout, time.Second).Should(BeTrue())
 
@@ -206,7 +206,7 @@ metadata:
 
 			Eventually(func() bool {
 				var obj kustomizev1.Kustomization
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &obj)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &obj)
 				return obj.Status.LastAppliedRevision == "main/"+artifactChecksum
 			}, timeout, time.Second).Should(BeTrue())
 
@@ -234,7 +234,7 @@ metadata:
 
 			Eventually(func() bool {
 				var obj kustomizev1.Kustomization
-				_ = k8sClient.Get(context.Background(), ObjectKey(kustomization), &obj)
+				_ = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(kustomization), &obj)
 				return obj.Status.LastAppliedRevision == "main/"+artifactChecksum
 			}, timeout, time.Second).Should(BeTrue())
 

diff --git a/controllers/kustomization_indexers.go b/controllers/kustomization_indexers.go
@@ -44,7 +44,7 @@ func (r *KustomizationReconciler) requestsForRevisionChangeOf(indexKey string) f
 		ctx := context.Background()
 		var list kustomizev1.KustomizationList
 		if err := r.List(ctx, &list, client.MatchingFields{
-			indexKey: ObjectKey(obj).String(),
+			indexKey: client.ObjectKeyFromObject(obj).String(),
 		}); err != nil {
 			return nil
 		}

diff --git a/controllers/utils.go b/controllers/utils.go
@@ -17,8 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"strings"
 )
 
@@ -79,11 +77,3 @@ func containsString(slice []string, s string) bool {
 	}
 	return false
 }
-
-// ObjectKey returns client.ObjectKey for the object.
-func ObjectKey(object metav1.Object) client.ObjectKey {
-	return client.ObjectKey{
-		Namespace: object.GetNamespace(),
-		Name:      object.GetName(),
-	}
-}