From 8d2ed6a6ba467ddb4dcba0a7e1675cf8382223c3 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 15 Aug 2022 16:04:55 +0200 Subject: [PATCH] reconciler/permissionclaim: don't depend on nil/empty distinction in LabelFor --- .../permissionclaimlabel_resource_reconcile.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go index d950f6d83834..075306313ef5 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go @@ -44,19 +44,14 @@ func (c *resourceController) reconcile(ctx context.Context, obj *unstructured.Un return fmt.Errorf("error calculating permission claim labels for GVR %q %s/%s: %w", gvr, obj.GetNamespace(), obj.GetName(), err) } - labels := obj.GetLabels() - if labels == nil { - labels = make(map[string]string) - } - actualClaimLabels := make(map[string]string) - for k, v := range labels { + for k, v := range obj.GetLabels() { if strings.HasPrefix(k, apisv1alpha1.APIExportPermissionClaimLabelPrefix) { actualClaimLabels[k] = v } } - if reflect.DeepEqual(expectedLabels, actualClaimLabels) { + if (len(expectedLabels) == 0 && len(actualClaimLabels) == 0) || reflect.DeepEqual(expectedLabels, actualClaimLabels) { return nil }