Merge pull request #707 from sebgl/ignore-controllerref-version

🐛 Fix SetControllerReference to consider multiple CRD versions

Author: k8s-ci-robot

pkg/controller/controllerutil/controllerutil.go

@@ -111,7 +111,7 @@ func referSameObject(a, b metav1.OwnerReference) bool {
 		return false
 	}
 
-	return aGV == bGV && a.Kind == b.Kind && a.Name == b.Name
+	return aGV.Group == bGV.Group && a.Kind == b.Kind && a.Name == b.Name
 }
 
 // OperationResult is the action result of a CreateOrUpdate call

pkg/controller/controllerutil/controllerutil_test.go

@@ -133,6 +133,34 @@ var _ = Describe("Controllerutil", func() {
 
 			Expect(err).To(HaveOccurred())
 		})
+
+		It("should not return any error if the existing owner has a different version", func() {
+			f := false
+			t := true
+			rsOwners := []metav1.OwnerReference{
+				{
+					Name:               "foo",
+					Kind:               "Deployment",
+					APIVersion:         "extensions/v1alpha1",
+					UID:                "foo-uid",
+					Controller:         &f,
+					BlockOwnerDeletion: &t,
+				},
+			}
+			rs := &appsv1.ReplicaSet{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default", OwnerReferences: rsOwners}}
+			dep := &extensionsv1beta1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default", UID: "foo-uid"}}
+
+			Expect(controllerutil.SetControllerReference(dep, rs, scheme.Scheme)).NotTo(HaveOccurred())
+			Expect(rs.OwnerReferences).To(ConsistOf(metav1.OwnerReference{
+				Name: "foo",
+				Kind: "Deployment",
+				// APIVersion is the new owner's one
+				APIVersion:         "extensions/v1beta1",
+				UID:                "foo-uid",
+				Controller:         &t,
+				BlockOwnerDeletion: &t,
+			}))
+		})
 	})
 
 	Describe("CreateOrUpdate", func() {