diff --git a/report/marshal_test.go b/report/marshal_test.go index 5fb2381ec..b1792303c 100644 --- a/report/marshal_test.go +++ b/report/marshal_test.go @@ -44,7 +44,6 @@ func makeTestReport() report.Report { r.Endpoint.AddNode(report.MakeNode(";172.20.1.168;41582"). WithTopology("endpoint"). WithSet("snooped_dns_names", report.MakeStringSet("ip-172-20-1-168.ec2.internal")). - WithControls("docker_remove_container"). WithLatestActiveControls("docker_pause_container"). WithLatest("addr", t1, "127.0.0.1"), ) @@ -57,7 +56,6 @@ func makeTestReport() report.Report { r.Pod.WithShape("heptagon").WithLabel("pod", "pods"). AddNode(report.MakeNode("fceef9592ec3cf1a8e1d178fdd0de41a;"). WithTopology("pod"). - WithControls("kubernetes_delete_pod"). WithLatestControls(map[string]report.NodeControlData{"kubernetes_get_logs": {Dead: true}}). WithLatest("host_node_id", t1, "ip-172-20-1-168;")) r.Overlay.WithMetadataTemplates(report.MetadataTemplates{ diff --git a/report/node.go b/report/node.go index 3a11b6027..3b68f43a4 100644 --- a/report/node.go +++ b/report/node.go @@ -15,7 +15,6 @@ type Node struct { Counters Counters `json:"counters,omitempty"` Sets Sets `json:"sets,omitempty"` Adjacency IDList `json:"adjacency,omitempty"` - Controls NodeControls `json:"controls,omitempty"` LatestControls NodeControlDataLatestMap `json:"latestControls,omitempty"` Latest StringLatestMap `json:"latest,omitempty"` Metrics Metrics `json:"metrics,omitempty" deepequal:"nil==empty"` @@ -30,7 +29,6 @@ func MakeNode(id string) Node { Counters: MakeCounters(), Sets: MakeSets(), Adjacency: MakeIDList(), - Controls: MakeNodeControls(), LatestControls: MakeNodeControlDataLatestMap(), Latest: MakeStringLatestMap(), Metrics: Metrics{}, @@ -120,12 +118,6 @@ func (n Node) WithAdjacent(a ...string) Node { return n } -// WithControls returns a fresh copy of n, with cs added to Controls. -func (n Node) WithControls(cs ...string) Node { - n.Controls = n.Controls.Add(cs...) - return n -} - // WithLatestActiveControls returns a fresh copy of n, with active controls cs added to LatestControls. func (n Node) WithLatestActiveControls(cs ...string) Node { lcs := map[string]NodeControlData{} @@ -199,7 +191,6 @@ func (n Node) Merge(other Node) Node { Counters: n.Counters.Merge(other.Counters), Sets: n.Sets.Merge(other.Sets), Adjacency: n.Adjacency.Merge(other.Adjacency), - Controls: n.Controls.Merge(other.Controls), LatestControls: n.LatestControls.Merge(other.LatestControls), Latest: n.Latest.Merge(other.Latest), Metrics: n.Metrics.Merge(other.Metrics), diff --git a/report/report.go b/report/report.go index 5c065d186..0694e7e34 100644 --- a/report/report.go +++ b/report/report.go @@ -419,43 +419,8 @@ func (r Report) Validate() error { // Upgrade returns a new report based on a report received from the old probe. // -// This for now creates node's LatestControls from Controls. func (r Report) Upgrade() Report { - return r.upgradeLatestControls().upgradePodNodes().upgradeNamespaces().upgradeDNSRecords() -} - -func (r Report) upgradeLatestControls() Report { - needUpgrade := false - r.WalkTopologies(func(topology *Topology) { - for _, node := range topology.Nodes { - if node.LatestControls.Size() == 0 && len(node.Controls.Controls) > 0 { - needUpgrade = true - } - } - }) - - if !needUpgrade { - return r - } - - cp := r.Copy() - ncd := NodeControlData{ - Dead: false, - } - cp.WalkTopologies(func(topology *Topology) { - n := Nodes{} - for name, node := range topology.Nodes { - if node.LatestControls.Size() == 0 && len(node.Controls.Controls) > 0 { - for _, control := range node.Controls.Controls { - node.LatestControls = node.LatestControls.Set(control, node.Controls.Timestamp, ncd) - } - } - n[name] = node - } - topology.Nodes = n - }) - - return cp + return r.upgradePodNodes().upgradeNamespaces().upgradeDNSRecords() } func (r Report) upgradePodNodes() Report { diff --git a/report/report_test.go b/report/report_test.go index b701a8ef5..6ecbc1c8d 100644 --- a/report/report_test.go +++ b/report/report_test.go @@ -82,14 +82,8 @@ func TestReportUpgrade(t *testing.T) { namespaceID := report.MakeNamespaceNodeID(namespaceName) podNode := report.MakeNode("foo"). WithLatests(map[string]string{report.KubernetesNamespace: namespaceName}). - WithControls("alive"). WithParents(report.MakeSets().Add(report.ReplicaSet, report.MakeStringSet("bar"))) - controls := map[string]report.NodeControlData{ - "alive": { - Dead: false, - }, - } - expectedPodNode := podNode.PruneParents().WithParents(parentsWithDeployment).WithLatestControls(controls) + expectedPodNode := podNode.PruneParents().WithParents(parentsWithDeployment) rpt := report.MakeReport() rpt.ReplicaSet.AddNode(rsNode) rpt.Pod.AddNode(podNode)