diff --git a/go.mod b/go.mod index 7ab017a84..30574ccf2 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/rancher/gitwatcher v0.4.1 github.com/rancher/norman v0.0.0-20191030191625-ebecbda5fbe3 github.com/rancher/rdns-server v0.5.7-0.20190927164127-7128efe7d065 - github.com/rancher/wrangler v0.2.1-0.20191104064538-22e063a2a843 + github.com/rancher/wrangler v0.2.1-0.20191109002915-2a833f7e410d github.com/rancher/wrangler-api v0.2.1-0.20191025043713-b1ca9c21825a github.com/sclevine/spec v1.3.0 github.com/sirupsen/logrus v1.4.2 diff --git a/go.sum b/go.sum index 95b5eb5d2..6a48a3bbc 100644 --- a/go.sum +++ b/go.sum @@ -867,8 +867,8 @@ github.com/rancher/wrangler v0.1.4/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xs github.com/rancher/wrangler v0.1.7-0.20190824203417-e7b6ecb74e90/go.mod h1:TLc4vXF21FWz2MYNHny5zDwFwBqvgBViU5n9CHrJRQ0= github.com/rancher/wrangler v0.2.1-0.20191015042916-f2a6ecca4f20/go.mod h1:w9jivI6vlBZmqzizNQM0Li/ZwoNTBeDpIv+NtBoFiMI= github.com/rancher/wrangler v0.2.1-0.20191025041946-1fd360590735/go.mod h1:zmXTOSzU0vhumCyl0+Acq2FEP5WJOJRqnCQDegknyWA= -github.com/rancher/wrangler v0.2.1-0.20191104064538-22e063a2a843 h1:wA/G3cxg2kPf7TkznuU3J6OY+yFwu5r/2cwitL9mse0= -github.com/rancher/wrangler v0.2.1-0.20191104064538-22e063a2a843/go.mod h1:zmXTOSzU0vhumCyl0+Acq2FEP5WJOJRqnCQDegknyWA= +github.com/rancher/wrangler v0.2.1-0.20191109002915-2a833f7e410d h1:lz9Aef0JEy2xmJhbU0jMfQ3Mh3pUFM9AP00pgUsQAlk= +github.com/rancher/wrangler v0.2.1-0.20191109002915-2a833f7e410d/go.mod h1:zmXTOSzU0vhumCyl0+Acq2FEP5WJOJRqnCQDegknyWA= github.com/rancher/wrangler-api v0.1.4/go.mod h1:Mc8bNN5rNxpQ7am2orUbonahw4xJ6ztF+fUTSku8KnE= github.com/rancher/wrangler-api v0.2.1-0.20191025043713-b1ca9c21825a h1:dH3D71jzKuYRY7qLe9AKuwz8DKO6G9PCfkeafETMmZo= github.com/rancher/wrangler-api v0.2.1-0.20191025043713-b1ca9c21825a/go.mod h1:U4nfgObQ7EERMwljGhCfQIbh2ql/t8suINX8/VfWiko= diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go index ced35a1f6..e62b41aa5 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_process.go @@ -85,14 +85,25 @@ func (o *desiredSet) assignOwnerReference(gvk schema.GroupVersionKind, objs map[ meta.SetNamespace(ownerMeta.GetNamespace()) } - meta.SetOwnerReferences(append(meta.GetOwnerReferences(), v1.OwnerReference{ - APIVersion: ownerGVK.GroupVersion().String(), - Kind: ownerGVK.Kind, - Name: ownerMeta.GetName(), - UID: ownerMeta.GetUID(), - Controller: &o.ownerReferenceController, - BlockOwnerDeletion: &o.ownerReferenceBlock, - })) + shouldSet := true + for _, of := range meta.GetOwnerReferences() { + if ownerMeta.GetUID() == of.UID { + shouldSet = false + break + } + } + + if shouldSet { + meta.SetOwnerReferences(append(meta.GetOwnerReferences(), v1.OwnerReference{ + APIVersion: ownerGVK.GroupVersion().String(), + Kind: ownerGVK.Kind, + Name: ownerMeta.GetName(), + UID: ownerMeta.GetUID(), + Controller: &o.ownerReferenceController, + BlockOwnerDeletion: &o.ownerReferenceBlock, + })) + } + objs[k] = v if assignNS { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8d03d4833..7d8be8773 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -512,7 +512,7 @@ github.com/rancher/norman/pkg/types/values # github.com/rancher/rdns-server v0.5.7-0.20190927164127-7128efe7d065 github.com/rancher/rdns-server/client github.com/rancher/rdns-server/model -# github.com/rancher/wrangler v0.2.1-0.20191104064538-22e063a2a843 +# github.com/rancher/wrangler v0.2.1-0.20191109002915-2a833f7e410d github.com/rancher/wrangler/pkg/apply github.com/rancher/wrangler/pkg/apply/injectors github.com/rancher/wrangler/pkg/cleanup