github-personal/kamaji
1
0
Fork 0
mirror of https://github.com/outbackdingo/kamaji.git synced 2026-01-27 10:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handling create or update for patch resources (#942)

Browse Source 
Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>
This commit is contained in:
Dario Tranchitella
2025-09-05 09:42:17 +02:00
committed by GitHub
parent 8be3eebdbe
commit 4a474d5749
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/resources/addons/coredns.go
View File

@@ -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())
})
}

4
internal/resources/addons/kube_proxy.go
View File

@@ -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())
})
}