Remove annotations completely instead of setting an empty map in the modified configuration. Fix package name. Fix to use local annotator instead the default in Patchmaker.

Author: pepov

patch/annotation.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package objectmatcher
+package patch
 
 import (
 	"encoding/json"
@@ -103,6 +103,10 @@ func (a *Annotator) GetModifiedConfiguration(obj runtime.Object, annotate bool)
 		return nil, err
 	}
 
+	// Do not include an empty annotation map
+	if len(annots) == 0 {
+		a.metadataAccessor.SetAnnotations(obj, nil)
+	}
 	modified, err = json.Marshal(obj)
 	if err != nil {
 		return nil, err

patch/annotation_test.go

@@ -0,0 +1,35 @@
+// Copyright © 2019 Banzai Cloud
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package patch
+
+import (
+	"testing"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+func TestAnnotationRemovedWhenEmpty(t *testing.T) {
+	u := unstructured.Unstructured{}
+	u.SetAnnotations(map[string]string{
+		LastAppliedConfig: "{}",
+	})
+	modified, err := DefaultAnnotator.GetModifiedConfiguration(&u, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if "{\"metadata\":{}}" != string(modified) {
+		t.Fatalf("Expected {\"metadata\":{} got %s", string(modified))
+	}
+}

patch/deletenull.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package objectmatcher
+package patch
 
 import (
 	"encoding/json"

patch/patch.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package objectmatcher
+package patch
 
 import (
 	"encoding/json"
@@ -53,7 +53,7 @@ func (p *PatchMaker) Calculate(currentObject, modifiedObject runtime.Object) (*P
 		return nil, emperror.Wrap(err, "Failed to delete null from modified object")
 	}
 
-	original, err := DefaultAnnotator.GetOriginalConfiguration(currentObject)
+	original, err := p.annotator.GetOriginalConfiguration(currentObject)
 	if err != nil {
 		return nil, emperror.Wrap(err, "Failed to get original configuration")
 	}