base64 encode last-applied annotation (#28)

Author: bonifaido

integration_test.go

@@ -223,6 +223,13 @@ func TestIntegration(t *testing.T) {
 				pod := i.(*v1.Pod)
 				pod.Spec.Affinity = nil
 			}),
+		NewTestMatch("secret matches with original",
+			&v1.Secret{
+				ObjectMeta: standardObjectMeta(),
+				Data: map[string][]byte{
+					"key": []byte("secretValue"),
+				},
+			}),
 		NewTestMatch("serviceaccount matches with original",
 			&v1.ServiceAccount{
 				ObjectMeta: standardObjectMeta(),

main_test.go

@@ -280,6 +280,17 @@ func testMatchOnObject(testItem *TestItem) error {
 				log.Printf("Failed to remove object %s", existing.GetName())
 			}
 		}()
+	case *v1.Secret:
+		existing, err = testContext.Client.CoreV1().Secrets(newObject.GetNamespace()).Create(newObject.(*v1.Secret))
+		if err != nil {
+			return emperror.WrapWith(err, "failed to create object", "object", newObject)
+		}
+		defer func() {
+			err = testContext.Client.CoreV1().Secrets(newObject.GetNamespace()).Delete(existing.GetName(), deleteOptions)
+			if err != nil {
+				log.Printf("Failed to remove object %s", existing.GetName())
+			}
+		}()
 	case *v1beta1.CustomResourceDefinition:
 		existing, err = testContext.ExtensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(newObject.(*v1beta1.CustomResourceDefinition))
 		if err != nil {

patch/annotation.go

@@ -15,6 +15,8 @@
 package patch
 
 import (
+	"encoding/base64"
+
 	json "github.com/json-iterator/go"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -54,6 +56,11 @@ func (a *Annotator) GetOriginalConfiguration(obj runtime.Object) ([]byte, error)
 		return nil, nil
 	}
 
+	// Try to base64 decode, and fallback to non-base64 encoded content for backwards compatibility.
+	if decoded, err := base64.StdEncoding.DecodeString(original); err == nil {
+		return decoded, nil
+	}
+
 	return []byte(original), nil
 }
 
@@ -73,7 +80,7 @@ func (a *Annotator) SetOriginalConfiguration(obj runtime.Object, original []byte
 		annots = map[string]string{}
 	}
 
-	annots[a.key] = string(original)
+	annots[a.key] = base64.StdEncoding.EncodeToString(original)
 	return a.metadataAccessor.SetAnnotations(obj, annots)
 }
 
@@ -107,13 +114,14 @@ func (a *Annotator) GetModifiedConfiguration(obj runtime.Object, annotate bool)
 	if len(annots) == 0 {
 		a.metadataAccessor.SetAnnotations(obj, nil)
 	}
+
 	modified, err = json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
 
 	if annotate {
-		annots[a.key] = string(modified)
+		annots[a.key] = base64.StdEncoding.EncodeToString(modified)
 		if err := a.metadataAccessor.SetAnnotations(obj, annots); err != nil {
 			return nil, err
 		}