detect ownerReference changes

Author: wpjunior

go.mod

@@ -77,7 +77,7 @@ require (
 	istio.io/gogo-genproto v0.0.0-20201015184601-1e80d26d6249 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect

kubernetes/ingress.go

@@ -211,7 +211,7 @@ func (k *IngressService) Ensure(ctx context.Context, id router.InstanceID, o rou
 			return err
 		}
 	} else if ingressHasChanges(span, existingIngress, ingress) {
-		err = k.mergeIngresses(ctx, ingress, existingIngress, id, ingressClient, span)
+		err = k.mergeIngressAndUpdate(ctx, ingress, existingIngress, id, ingressClient, span)
 		if err != nil {
 			setSpanError(span, err)
 			return err
@@ -266,8 +266,9 @@ func (k *IngressService) Ensure(ctx context.Context, id router.InstanceID, o rou
 	return nil
 }
 
-func (k *IngressService) mergeIngresses(ctx context.Context, ingress *networkingV1.Ingress, existingIngress *networkingV1.Ingress, id router.InstanceID, ingressClient networkingTypedV1.IngressInterface, span opentracing.Span) error {
+func (k *IngressService) mergeIngressAndUpdate(ctx context.Context, ingress *networkingV1.Ingress, existingIngress *networkingV1.Ingress, id router.InstanceID, ingressClient networkingTypedV1.IngressInterface, span opentracing.Span) error {
 	ingress.ObjectMeta.ResourceVersion = existingIngress.ObjectMeta.ResourceVersion
+	ingress.ObjectMeta.UID = existingIngress.ObjectMeta.UID
 	if existingIngress.Spec.DefaultBackend != nil {
 		ingress.Spec.DefaultBackend = existingIngress.Spec.DefaultBackend
 	}
@@ -409,7 +410,7 @@ func (k *IngressService) ensureCNameBackend(ctx context.Context, opts ensureCNam
 	}
 
 	if ingressHasChanges(span, existingIngress, ingress) {
-		err = k.mergeIngresses(ctx, ingress, existingIngress, opts.id, ingressClient, span)
+		err = k.mergeIngressAndUpdate(ctx, ingress, existingIngress, opts.id, ingressClient, span)
 		if err != nil {
 			return err
 		}
@@ -990,6 +991,14 @@ func ingressHasChanges(span opentracing.Span, existing *networkingV1.Ingress, in
 		return true
 	}
 
+	if !reflect.DeepEqual(existing.OwnerReferences, ing.OwnerReferences) {
+		span.LogKV(
+			"message", "ingress has changed the ownerReferences",
+			"ingress", existing.Name,
+		)
+		return true
+	}
+
 	if existing.Annotations[AnnotationsCNames] != ing.Annotations[AnnotationsCNames] {
 		return true
 	}

kubernetes/ingress_test.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/tsuru/kubernetes-router/router"
@@ -1832,3 +1833,35 @@ func defaultIngress(name, namespace string) *networkingV1.Ingress {
 		},
 	}
 }
+
+func TestIngressHasChanges(t *testing.T) {
+	span := opentracing.NoopTracer{}.StartSpan("test")
+	existing := &networkingV1.Ingress{
+		ObjectMeta: metav1.ObjectMeta{
+			OwnerReferences: []metav1.OwnerReference{
+				{
+					APIVersion:         "v1",
+					Kind:               "Service",
+					Name:               "test-web",
+					BlockOwnerDeletion: ptr.To(true),
+					Controller:         ptr.To(true),
+				},
+			},
+		},
+	}
+	ing := &networkingV1.Ingress{
+		ObjectMeta: metav1.ObjectMeta{
+			OwnerReferences: []metav1.OwnerReference{
+				{
+					APIVersion:         "networking.k8s.io/v1",
+					Kind:               "Ingress",
+					Name:               "test-web",
+					BlockOwnerDeletion: ptr.To(true),
+					Controller:         ptr.To(true),
+				},
+			},
+		},
+	}
+
+	assert.True(t, ingressHasChanges(span, existing, ing))
+}