From 293b54efd335eb0b3c0f2099048816c75023893e Mon Sep 17 00:00:00 2001 From: ajanikow <12255597+ajanikow@users.noreply.github.com> Date: Wed, 7 Oct 2020 18:52:02 +0000 Subject: [PATCH] Allow replace on empty annotations --- CHANGELOG.md | 1 + pkg/util/collection/map.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be3f58991..9b8a3a553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A) - Fix Panics in Deployments without authentication - Fix ChaosMonkey mode +- Allow append on empty annotations ## [1.0.8](https://github.com/arangodb/kube-arangodb/tree/1.0.8) (2020-09-10) - Fix Volume rotation on AKS diff --git a/pkg/util/collection/map.go b/pkg/util/collection/map.go index b8b644a23..cef8da796 100644 --- a/pkg/util/collection/map.go +++ b/pkg/util/collection/map.go @@ -160,6 +160,9 @@ func getFieldPatch(mode api.LabelsMode, section string, expected map[string]stri case api.LabelsDisabledMode: break case api.LabelsAppendMode: + if len(actual) == 0 { + return patch.NewPatch(patch.ItemReplace(patch.NewPath("metadata", section), expected)) + } for e, v := range expected { if a, ok := actual[e]; !ok { p.ItemAdd(patch.NewPath("metadata", section, e), v) @@ -168,6 +171,9 @@ func getFieldPatch(mode api.LabelsMode, section string, expected map[string]stri } } case api.LabelsReplaceMode: + if len(actual) == 0 { + return patch.NewPatch(patch.ItemReplace(patch.NewPath("metadata", section), expected)) + } for e, v := range expected { if a, ok := actual[e]; !ok { p.ItemAdd(patch.NewPath("metadata", section, e), v)