From 4a474d5749eea5afe89260cac26f2167c180371d Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Fri, 5 Sep 2025 09:42:17 +0200 Subject: [PATCH] fix: handling create or update for patch resources (#942) Signed-off-by: Dario Tranchitella --- internal/resources/addons/coredns.go | 8 ++++---- internal/resources/addons/kube_proxy.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/resources/addons/coredns.go b/internal/resources/addons/coredns.go index 74717ab..64010ae 100644 --- a/internal/resources/addons/coredns.go +++ b/internal/resources/addons/coredns.go @@ -298,8 +298,8 @@ func (c *CoreDNS) mutateDeployment(ctx context.Context, tenantClient client.Clie if err := tenantClient.Get(ctx, client.ObjectKeyFromObject(&deployment), &deployment); err != nil { if k8serrors.IsNotFound(err) { - return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, &deployment, func() error { - return controllerutil.SetControllerReference(c.clusterRoleBinding, &deployment, tenantClient.Scheme()) + return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, c.deployment, func() error { + return controllerutil.SetControllerReference(c.clusterRoleBinding, c.deployment, tenantClient.Scheme()) }) } @@ -334,8 +334,8 @@ func (c *CoreDNS) mutateService(ctx context.Context, tenantClient client.Client) if err := tenantClient.Get(ctx, client.ObjectKeyFromObject(&svc), &svc); err != nil { if k8serrors.IsNotFound(err) { - return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, &svc, func() error { - return controllerutil.SetControllerReference(c.clusterRoleBinding, &svc, tenantClient.Scheme()) + return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, c.service, func() error { + return controllerutil.SetControllerReference(c.clusterRoleBinding, c.service, tenantClient.Scheme()) }) } diff --git a/internal/resources/addons/kube_proxy.go b/internal/resources/addons/kube_proxy.go index 79dafca..67867ef 100644 --- a/internal/resources/addons/kube_proxy.go +++ b/internal/resources/addons/kube_proxy.go @@ -303,8 +303,8 @@ func (k *KubeProxy) mutateDaemonSet(ctx context.Context, tenantClient client.Cli if err := tenantClient.Get(ctx, client.ObjectKeyFromObject(&ds), &ds); err != nil { if k8serrors.IsNotFound(err) { - return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, &ds, func() error { - return controllerutil.SetControllerReference(k.clusterRoleBinding, &ds, tenantClient.Scheme()) + return utilities.CreateOrUpdateWithConflict(ctx, tenantClient, k.daemonSet, func() error { + return controllerutil.SetControllerReference(k.clusterRoleBinding, k.daemonSet, tenantClient.Scheme()) }) }