diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-08 12:59:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 12:59:42 +0200 |
| commit | 4b300a12cedabff3c57ee657afac0696cefaae0a (patch) | |
| tree | 61c5fceec50e88338038415fa1375371bef2dca4 /vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go | |
| parent | 70e7fc670be13d3877e65e160456c312e23a5806 (diff) | |
| parent | 2f0bc5ff1cde9afb595868b92dd123478af9ef74 (diff) | |
| download | podman-4b300a12cedabff3c57ee657afac0696cefaae0a.tar.gz podman-4b300a12cedabff3c57ee657afac0696cefaae0a.tar.bz2 podman-4b300a12cedabff3c57ee657afac0696cefaae0a.zip | |
Merge pull request #6086 from containers/dependabot/go_modules/k8s.io/api-0.18.2
Bump k8s.io/api from 0.17.4 to 0.18.2
Diffstat (limited to 'vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go')
| -rw-r--r-- | vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go index ec016fd3c..ad989ad75 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go @@ -252,7 +252,9 @@ func ResetObjectMetaForStatus(meta, existingMeta Object) { meta.SetAnnotations(existingMeta.GetAnnotations()) meta.SetFinalizers(existingMeta.GetFinalizers()) meta.SetOwnerReferences(existingMeta.GetOwnerReferences()) - meta.SetManagedFields(existingMeta.GetManagedFields()) + // managedFields must be preserved since it's been modified to + // track changed fields in the status update. + //meta.SetManagedFields(existingMeta.GetManagedFields()) } // MarshalJSON implements json.Marshaler |