From 0d3f93a82f96f7ea099b5173fb139f5e01cd70b8 Mon Sep 17 00:00:00 2001 From: Mangaal Date: Wed, 11 Jun 2025 15:00:45 +0530 Subject: [PATCH 1/4] Chore: Remove Endpoints ownerRef workaround for fixed k8s issue #28483 Signed-off-by: Mangaal --- pkg/cache/references.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkg/cache/references.go b/pkg/cache/references.go index cb16314b9..9be072f10 100644 --- a/pkg/cache/references.go +++ b/pkg/cache/references.go @@ -24,14 +24,6 @@ func (c *clusterCache) resolveResourceReferences(un *unstructured.Unstructured) gvk := un.GroupVersionKind() switch { - // Special case for endpoint. Remove after https://github.com/kubernetes/kubernetes/issues/28483 is fixed - case gvk.Group == "" && gvk.Kind == kube.EndpointsKind && len(ownerRefs) == 0: - ownerRefs = append(ownerRefs, metav1.OwnerReference{ - Name: un.GetName(), - Kind: kube.ServiceKind, - APIVersion: "v1", - }) - // Special case for Operator Lifecycle Manager ClusterServiceVersion: case gvk.Group == "operators.coreos.com" && gvk.Kind == "ClusterServiceVersion": if un.GetAnnotations()["olm.operatorGroup"] != "" { From 432dd3d5bb74790781a5108810b5ac77b3ad19a3 Mon Sep 17 00:00:00 2001 From: Mangaal Date: Wed, 11 Jun 2025 16:11:46 +0530 Subject: [PATCH 2/4] no test needed for endpoint Signed-off-by: Mangaal --- pkg/cache/resource_test.go | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkg/cache/resource_test.go b/pkg/cache/resource_test.go index a3b06a6cc..adc08654d 100644 --- a/pkg/cache/resource_test.go +++ b/pkg/cache/resource_test.go @@ -28,30 +28,6 @@ func TestIsParentOfSameKindDifferentGroupAndUID(t *testing.T) { assert.False(t, invalidParent.isParentOf(child)) } -func TestIsServiceParentOfEndPointWithTheSameName(t *testing.T) { - nonMatchingNameEndPoint := cacheTest.newResource(strToUnstructured(` -apiVersion: v1 -kind: Endpoints -metadata: - name: not-matching-name - namespace: default -`)) - - matchingNameEndPoint := cacheTest.newResource(strToUnstructured(` -apiVersion: v1 -kind: Endpoints -metadata: - name: helm-guestbook - namespace: default -`)) - - parent := cacheTest.newResource(testService) - - assert.True(t, parent.isParentOf(matchingNameEndPoint)) - assert.Equal(t, parent.Ref.UID, matchingNameEndPoint.OwnerRefs[0].UID) - assert.False(t, parent.isParentOf(nonMatchingNameEndPoint)) -} - func TestIsServiceAccountParentOfSecret(t *testing.T) { serviceAccount := cacheTest.newResource(strToUnstructured(` apiVersion: v1 From 9bbc80cba0880760f5763a8d850c92fa77abdbef Mon Sep 17 00:00:00 2001 From: Mangaal Date: Wed, 11 Jun 2025 16:45:20 +0530 Subject: [PATCH 3/4] remove unused var testService Signed-off-by: Mangaal --- pkg/cache/cluster_test.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkg/cache/cluster_test.go b/pkg/cache/cluster_test.go index 8aa286fc4..2412bfde5 100644 --- a/pkg/cache/cluster_test.go +++ b/pkg/cache/cluster_test.go @@ -54,24 +54,6 @@ func strToUnstructured(jsonStr string) *unstructured.Unstructured { var ( testCreationTime, _ = time.Parse(time.RFC3339, "2018-09-20T06:47:27Z") - - testService = strToUnstructured(fmt.Sprintf(` - apiVersion: v1 - kind: Service - metadata: - name: helm-guestbook - namespace: default - resourceVersion: "123" - uid: "4" - creationTimestamp: "%s" - spec: - selector: - app: guestbook - type: LoadBalancer - status: - loadBalancer: - ingress: - - hostname: localhost`, testCreationTime.UTC().Format(time.RFC3339))) ) func newCluster(tb testing.TB, objs ...runtime.Object) *clusterCache { From e9230a09e29b05863d1649e689038628d95cdf06 Mon Sep 17 00:00:00 2001 From: Mangaal Date: Wed, 11 Jun 2025 16:49:50 +0530 Subject: [PATCH 4/4] fix incorrect formatting Signed-off-by: Mangaal --- pkg/cache/cluster_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/cache/cluster_test.go b/pkg/cache/cluster_test.go index 2412bfde5..793f0b5df 100644 --- a/pkg/cache/cluster_test.go +++ b/pkg/cache/cluster_test.go @@ -52,9 +52,7 @@ func strToUnstructured(jsonStr string) *unstructured.Unstructured { return &unstructured.Unstructured{Object: obj} } -var ( - testCreationTime, _ = time.Parse(time.RFC3339, "2018-09-20T06:47:27Z") -) +var testCreationTime, _ = time.Parse(time.RFC3339, "2018-09-20T06:47:27Z") func newCluster(tb testing.TB, objs ...runtime.Object) *clusterCache { tb.Helper()