Merge pull request #3374 from ncdc/no-gvk

🌱 Only look at Group and Kind for GetOwnerCluster
kubernetes-sigs · Jul 21, 2020 · 682ecea · 682ecea
2 parents 337b406 + 4f09531
commit 682ecea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/util/util.go b/util/util.go
@@ -243,7 +243,14 @@ func GetClusterFromMetadata(ctx context.Context, c client.Client, obj metav1.Obj
 // GetOwnerCluster returns the Cluster object owning the current resource.
 func GetOwnerCluster(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*clusterv1.Cluster, error) {
 	for _, ref := range obj.OwnerReferences {
-		if ref.Kind == "Cluster" && ref.APIVersion == clusterv1.GroupVersion.String() {
+		if ref.Kind != "Cluster" {
+			continue
+		}
+		gv, err := schema.ParseGroupVersion(ref.APIVersion)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+		if gv.Group == clusterv1.GroupVersion.Group {
 			return GetClusterByName(ctx, c, obj.Namespace, ref.Name)
 		}
 	}

diff --git a/util/util_test.go b/util/util_test.go
@@ -454,6 +454,12 @@ func TestGetOwnerClusterSuccessByName(t *testing.T) {
 	cluster, err := GetOwnerCluster(context.TODO(), c, objm)
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(cluster).NotTo(BeNil())
+
+	// Make sure API version does not matter
+	objm.OwnerReferences[0].APIVersion = "cluster.x-k8s.io/v1alpha1234"
+	cluster, err = GetOwnerCluster(context.TODO(), c, objm)
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(cluster).NotTo(BeNil())
 }
 
 func TestGetOwnerMachineSuccessByName(t *testing.T) {