github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-19 21:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix accidental rename of DNS to 'nodes'

Browse Source 
In commit 951629af29 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.
This commit is contained in:
Bryan Boreham
2019-10-14 14:53:07 +00:00
parent 83f9d4ec8d
commit 6ccbd2d0cf
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
report/report.go
View File

@@ -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
}