From 6ccbd2d0cf5b0cabe1fb78359842bc24658e8820 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 14 Oct 2019 14:53:07 +0000 Subject: [PATCH] Fix accidental rename of DNS to 'nodes' In commit 951629af292a the `DNS` field was accidentally renamed in serialised data to `nodes`. Put it back, and also add a field to fix up data coming from a probe with that fault. --- report/report.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/report/report.go b/report/report.go index d8b4525ee..ceeced5d5 100644 --- a/report/report.go +++ b/report/report.go @@ -188,7 +188,9 @@ type Report struct { // Job represent all Kubernetes Job on hosts running probes. Job Topology - DNS DNSRecords `json:"nodes,omitempty" deepequal:"nil==empty"` + DNS DNSRecords `json:"DNS,omitempty" deepequal:"nil==empty"` + // For release 1.11.6, probes accidentally sent DNS records labeled "nodes". + BugDNS DNSRecords `json:"nodes,omitempty"` // Sampling data for this report. Sampling Sampling @@ -544,6 +546,11 @@ func (r Report) upgradeNamespaces() Report { } func (r Report) upgradeDNSRecords() Report { + // For release 1.11.6, probes accidentally sent DNS records labeled "nodes". + if len(r.BugDNS) > 0 { + r.DNS = r.BugDNS + r.BugDNS = nil + } if len(r.DNS) > 0 { return r }