Merge branch 'main' into support_admin_netpolicy

np-guard · Nov 4, 2024 · 884b288 · 884b288
2 parents b67cc4f + 8cfc3d2
commit 884b288
Show file tree

Hide file tree

Showing 105 changed files with 118 additions and 102 deletions.
diff --git a/pkg/netpol/connlist/conns_formatter_md.go b/pkg/netpol/connlist/conns_formatter_md.go
@@ -48,9 +48,11 @@ func getMDLine(c singleConnFields, srcFirst bool) string {
 func (md *formatMD) writeOutput(conns []Peer2PeerConnection, exposureConns []ExposedPeer, exposureFlag bool) (string, error) {
 	// first write connlist lines
 	allLines := md.writeMdConnlistLines(conns, exposureFlag)
-	if exposureFlag {
-		allLines = append(allLines, md.writeMdExposureLines(exposureConns)...)
+	if !exposureFlag {
+		return strings.Join(allLines, newLineChar) + newLineChar, nil
 	}
+	// add exposure lines
+	allLines = append(allLines, md.writeMdExposureLines(exposureConns)...)
 	return strings.Join(allLines, newLineChar), nil
 }
 

diff --git a/pkg/netpol/connlist/conns_formatter_txt.go b/pkg/netpol/connlist/conns_formatter_txt.go
@@ -25,8 +25,8 @@ func (t *formatText) writeOutput(conns []Peer2PeerConnection, exposureConns []Ex
 		return res, nil
 	}
 	// else append exposure analysis results:
-	if res != "" {
-		res += "\n\n"
+	if res != "" && res != newLineChar {
+		res += newLineChar
 	}
 	res += t.writeExposureOutput(exposureConns)
 	return res, nil
@@ -44,7 +44,7 @@ func (t *formatText) writeConnlistOutput(conns []Peer2PeerConnection, saveIPConn
 		}
 	}
 	sort.Strings(connLines)
-	return strings.Join(connLines, newLineChar)
+	return strings.Join(connLines, newLineChar) + newLineChar
 }
 
 const (
@@ -59,9 +59,14 @@ func (t *formatText) writeExposureOutput(exposureResults []ExposedPeer) string {
 	ingressExpLines, egressExpLines, unprotectedLines := getExposureConnsAsSortedSingleConnFieldsArray(exposureResults, t.ipMaps)
 	sort.Strings(unprotectedLines)
 	// writing results of exposure for all peers
-	res := exposureAnalysisHeader
-	res += writeExposureSubSection(writeStrings(egressExpLines, false, maxPeerStrLen), newLineChar+egressExposureHeader+newLineChar)
-	res += writeExposureSubSection(writeStrings(ingressExpLines, true, maxPeerStrLen), newLineChar+ingressExposureHeader+newLineChar)
+	res := exposureAnalysisHeader + newLineChar
+	res += writeExposureSubSection(writeStrings(egressExpLines, false, maxPeerStrLen), egressExposureHeader+newLineChar)
+	ingressHead := ingressExposureHeader + newLineChar
+	if len(egressExpLines) > 0 {
+		// add empty line between the sections if both are not empty
+		ingressHead = newLineChar + ingressHead
+	}
+	res += writeExposureSubSection(writeStrings(ingressExpLines, true, maxPeerStrLen), ingressHead)
 	res += writeExposureSubSection(unprotectedLines, unprotectedHeader)
 	return res
 }

diff --git a/pkg/netpol/diff/diff_formatter_text.go b/pkg/netpol/diff/diff_formatter_text.go
@@ -27,7 +27,7 @@ func (t *diffFormatText) writeDiffOutput(connsDiff ConnectivityDiff) (string, er
 	res := make([]string, 0)
 	res = append(res, connectivityDiffHeader)
 	res = append(res, writeDiffLinesOrderedByCategory(connsDiff, t)...)
-	return strings.Join(res, newLine), nil
+	return strings.Join(res, newLine) + newLine, nil
 }
 
 // singleDiffLine forms a single diff line in the txt format

diff --git a/test_outputs/cli/acs-security-demos_focus_workload_ingress-controller_connlist_output.txt b/test_outputs/cli/acs-security-demos_focus_workload_ingress-controller_connlist_output.txt
@@ -1,2 +1,2 @@
 {ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
-{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
+{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
diff --git a/test_outputs/cli/diff_between_onlineboutique_with_pods_severe_error_and_onlineboutique.txt b/test_outputs/cli/diff_between_onlineboutique_with_pods_severe_error_and_onlineboutique.txt
@@ -1,2 +1,2 @@
 Connectivity diff:
-diff-type: changed, source: default/frontend-99684f7f8[ReplicaSet], destination: default/adservice-77d5cd745d[ReplicaSet], dir1: TCP 9555, dir2: TCP 8080
+diff-type: changed, source: default/frontend-99684f7f8[ReplicaSet], destination: default/adservice-77d5cd745d[ReplicaSet], dir1: TCP 9555, dir2: TCP 8080
diff --git a/.../diff_between_onlineboutique_workloads_changed_workloads_and_onlineboutique_workloads.txt b/.../diff_between_onlineboutique_workloads_changed_workloads_and_onlineboutique_workloads.txt
@@ -2,4 +2,4 @@ Connectivity diff:
 diff-type: added, source: 0.0.0.0-255.255.255.255, destination: default/unicorn[Deployment], dir1: No Connections, dir2: All Connections, workloads-diff-info: workload default/unicorn[Deployment] added
 diff-type: added, source: default/redis-cart[Deployment], destination: default/unicorn[Deployment], dir1: No Connections, dir2: All Connections, workloads-diff-info: workload default/unicorn[Deployment] added
 diff-type: added, source: default/unicorn[Deployment], destination: 0.0.0.0-255.255.255.255, dir1: No Connections, dir2: All Connections, workloads-diff-info: workload default/unicorn[Deployment] added
-diff-type: added, source: default/unicorn[Deployment], destination: default/redis-cart[Deployment], dir1: No Connections, dir2: All Connections, workloads-diff-info: workload default/unicorn[Deployment] added
+diff-type: added, source: default/unicorn[Deployment], destination: default/redis-cart[Deployment], dir1: No Connections, dir2: All Connections, workloads-diff-info: workload default/unicorn[Deployment] added
diff --git a/test_outputs/cli/document_with_syntax_error_connlist_output.txt b/test_outputs/cli/document_with_syntax_error_connlist_output.txt
@@ -9,4 +9,4 @@ default/emailservice[Deployment] => default/checkoutservice[Deployment] : All Co
 default/emailservice[Deployment] => default/recommendationservice[Deployment] : All Connections
 default/recommendationservice[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
 default/recommendationservice[Deployment] => default/checkoutservice[Deployment] : All Connections
-default/recommendationservice[Deployment] => default/emailservice[Deployment] : All Connections
+default/recommendationservice[Deployment] => default/emailservice[Deployment] : All Connections
diff --git a/test_outputs/cli/onlineboutique_connlist_output.txt b/test_outputs/cli/onlineboutique_connlist_output.txt
@@ -14,4 +14,4 @@ default/frontend-99684f7f8[ReplicaSet] => default/recommendationservice-5f8c4567
 default/frontend-99684f7f8[ReplicaSet] => default/shippingservice-5bd985c46d[ReplicaSet] : TCP 50051
 default/loadgenerator-555fbdc87d[ReplicaSet] => default/frontend-99684f7f8[ReplicaSet] : TCP 8080
 default/recommendationservice-5f8c456796[ReplicaSet] => default/productcatalogservice-68765d49b6[ReplicaSet] : TCP 3550
-default/redis-cart-78746d49dc[ReplicaSet] => 0.0.0.0-255.255.255.255 : All Connections
+default/redis-cart-78746d49dc[ReplicaSet] => 0.0.0.0-255.255.255.255 : All Connections
diff --git a/...puts/cli/onlineboutique_workloads_focus_workload_default_emailservice_connlist_output.txt b/...puts/cli/onlineboutique_workloads_focus_workload_default_emailservice_connlist_output.txt
@@ -1 +1 @@
-default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
+default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
diff --git a/...uts/cli/onlineboutique_workloads_focus_workload_emailservice_connlist_output.md b/...uts/cli/onlineboutique_workloads_focus_workload_emailservice_connlist_output.md
@@ -1,3 +1,3 @@
 | src | dst | conn |
 |-----|-----|------|
-| default/checkoutservice[Deployment] | default/emailservice[Deployment] | TCP 8080 |
+| default/checkoutservice[Deployment] | default/emailservice[Deployment] | TCP 8080 |
diff --git a/test_outputs/cli/onlineboutique_workloads_focus_workload_emailservice_connlist_output.txt b/test_outputs/cli/onlineboutique_workloads_focus_workload_emailservice_connlist_output.txt
@@ -1 +1 @@
-default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
+default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
diff --git a/...onnlist/acs-security-demos-added-workloads_focus_workload_asset-cache_connlist_output.txt b/...onnlist/acs-security-demos-added-workloads_focus_workload_asset-cache_connlist_output.txt
@@ -1 +1 @@
-{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
+{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
diff --git a/...-security-demos-added-workloads_focus_workload_backend_recommendation_connlist_output.txt b/...-security-demos-added-workloads_focus_workload_backend_recommendation_connlist_output.txt
@@ -1,4 +1,4 @@
 backend/checkout[Deployment] => backend/recommendation[Deployment] : TCP 8080
 backend/recommendation[Deployment] => backend/catalog[Deployment] : TCP 8080
 backend/reports[Deployment] => backend/recommendation[Deployment] : TCP 8080
-frontend/webapp[Deployment] => backend/recommendation[Deployment] : TCP 8080
+frontend/webapp[Deployment] => backend/recommendation[Deployment] : TCP 8080
diff --git a/...cs-security-demos-added-workloads_focus_workload_frontend_asset-cache_connlist_output.txt b/...cs-security-demos-added-workloads_focus_workload_frontend_asset-cache_connlist_output.txt
@@ -1 +1 @@
-{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
+{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
diff --git a/.../acs-security-demos-added-workloads_focus_workload_ingress-controller_connlist_output.txt b/.../acs-security-demos-added-workloads_focus_workload_ingress-controller_connlist_output.txt
@@ -1,4 +1,4 @@
 {ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
 {ingress-controller} => frontend/blog[Deployment] : TCP 8080
 {ingress-controller} => frontend/webapp[Deployment] : TCP 8080
-{ingress-controller} => zeroday/zeroday[Deployment] : TCP 8080
+{ingress-controller} => zeroday/zeroday[Deployment] : TCP 8080
diff --git a/test_outputs/connlist/acs-security-demos-with-netpol-list_connlist_output.txt b/test_outputs/connlist/acs-security-demos-with-netpol-list_connlist_output.txt
@@ -11,4 +11,4 @@ frontend/webapp[Deployment] => backend/shipping[Deployment] : TCP 8080
 payments/gateway[Deployment] => payments/mastercard-processor[Deployment] : TCP 8080
 payments/gateway[Deployment] => payments/visa-processor[Deployment] : TCP 8080
 {ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
-{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
+{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
diff --git a/test_outputs/connlist/acs-security-demos_connlist_output.md b/test_outputs/connlist/acs-security-demos_connlist_output.md
@@ -13,4 +13,4 @@
 | payments/gateway[Deployment] | payments/mastercard-processor[Deployment] | TCP 8080 |
 | payments/gateway[Deployment] | payments/visa-processor[Deployment] | TCP 8080 |
 | {ingress-controller} | frontend/asset-cache[Deployment] | TCP 8080 |
-| {ingress-controller} | frontend/webapp[Deployment] | TCP 8080 |
+| {ingress-controller} | frontend/webapp[Deployment] | TCP 8080 |
diff --git a/test_outputs/connlist/acs-security-demos_connlist_output.txt b/test_outputs/connlist/acs-security-demos_connlist_output.txt
@@ -11,4 +11,4 @@ frontend/webapp[Deployment] => backend/shipping[Deployment] : TCP 8080
 payments/gateway[Deployment] => payments/mastercard-processor[Deployment] : TCP 8080
 payments/gateway[Deployment] => payments/visa-processor[Deployment] : TCP 8080
 {ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
-{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
+{ingress-controller} => frontend/webapp[Deployment] : TCP 8080
diff --git a/test_outputs/connlist/acs-security-demos_focus_workload_backend_catalog_exposure_output.txt b/test_outputs/connlist/acs-security-demos_focus_workload_backend_catalog_exposure_output.txt
@@ -1,4 +1,4 @@
 backend/recommendation[Deployment] => backend/catalog[Deployment] : TCP 8080
 backend/reports[Deployment] => backend/catalog[Deployment] : TCP 8080
 
-Exposure Analysis Result:
+Exposure Analysis Result:
diff --git a/test_outputs/connlist/acs_security_frontend_demos_connlist_output.md b/test_outputs/connlist/acs_security_frontend_demos_connlist_output.md
@@ -1,2 +1,2 @@
 | src | dst | conn |
-|-----|-----|------|
+|-----|-----|------|
diff --git a/test_outputs/connlist/acs_security_frontend_demos_connlist_output.txt b/test_outputs/connlist/acs_security_frontend_demos_connlist_output.txt
@@ -0,0 +1 @@
+
diff --git a/test_outputs/connlist/core_pods_without_host_ip_connlist_output.txt b/test_outputs/connlist/core_pods_without_host_ip_connlist_output.txt
@@ -459,4 +459,4 @@ vendor-system/foofoo-app[ReplicaSet] => kube-system/kube-fluentd[DaemonSet] : Al
 vendor-system/foofoo-app[ReplicaSet] => kube-system/storage-watcher-8494b4b8bb[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/tiller-deploy-5c45c9966b[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/vpn-858f6d9777[ReplicaSet] : All Connections
-vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
+vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
diff --git a/test_outputs/connlist/demo_app_with_routes_and_ingress_connlist_output.md b/test_outputs/connlist/demo_app_with_routes_and_ingress_connlist_output.md
@@ -14,4 +14,4 @@
 | routeworld/route-world[Deployment] | ingressworld/ingress-world[Deployment] | All Connections |
 | {ingress-controller} | helloworld/hello-world[Deployment] | TCP 8000 |
 | {ingress-controller} | ingressworld/ingress-world[Deployment] | TCP 8090 |
-| {ingress-controller} | routeworld/route-world[Deployment] | TCP 8060 |
+| {ingress-controller} | routeworld/route-world[Deployment] | TCP 8060 |
diff --git a/test_outputs/connlist/demo_app_with_routes_and_ingress_connlist_output.txt b/test_outputs/connlist/demo_app_with_routes_and_ingress_connlist_output.txt
@@ -12,4 +12,4 @@ routeworld/route-world[Deployment] => helloworld/hello-world[Deployment] : All C
 routeworld/route-world[Deployment] => ingressworld/ingress-world[Deployment] : All Connections
 {ingress-controller} => helloworld/hello-world[Deployment] : TCP 8000
 {ingress-controller} => ingressworld/ingress-world[Deployment] : TCP 8090
-{ingress-controller} => routeworld/route-world[Deployment] : TCP 8060
+{ingress-controller} => routeworld/route-world[Deployment] : TCP 8060
diff --git a/test_outputs/connlist/exposure_allow_all_in_cluster_test_exposure_output.txt b/test_outputs/connlist/exposure_allow_all_in_cluster_test_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	entire-cluster : All Connections

diff --git a/...tputs/connlist/exposure_test_conn_entire_cluster_with_empty_selectors_exposure_output.txt b/...tputs/connlist/exposure_test_conn_entire_cluster_with_empty_selectors_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	entire-cluster : All Connections

diff --git a/test_outputs/connlist/exposure_test_conn_to_all_pods_in_a_new_ns_exposure_output.txt b/test_outputs/connlist/exposure_test_conn_to_all_pods_in_a_new_ns_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	entire-cluster : All Connections

diff --git a/test_outputs/connlist/exposure_test_different_but_equiv_rules_exposure_output.txt b/test_outputs/connlist/exposure_test_different_but_equiv_rules_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	hello-world/[pod with {role=monitoring}] : All Connections

diff --git a/test_outputs/connlist/exposure_test_egress_with_named_port_exposure_output.txt b/test_outputs/connlist/exposure_test_egress_with_named_port_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	[namespace with {{Key:foo.com/managed-state,Operator:In,Values:[managed],}}]/[all pods] : TCP http

diff --git a/...tputs/connlist/exposure_test_pod_exposed_only_to_representative_peers_connlist_output.txt b/...tputs/connlist/exposure_test_pod_exposed_only_to_representative_peers_connlist_output.txt
@@ -1,2 +1,2 @@
 0.0.0.0-255.255.255.255 => hello-world/workload-a[Deployment] : All Connections
-hello-world/workload-a[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
+hello-world/workload-a[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
diff --git a/test_outputs/connlist/exposure_test_real_namespace_without_real_pod_exposure_output.txt b/test_outputs/connlist/exposure_test_real_namespace_without_real_pod_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Ingress Exposure:
 ns1/pod-in-ns1[Deployment] 	<= 	[namespace with {x=xval}]/[pod with {app=foo}] : TCP 8080

diff --git a/..._outputs/connlist/exposure_test_same_unmatched_rule_in_ingress_egress_exposure_output.txt b/..._outputs/connlist/exposure_test_same_unmatched_rule_in_ingress_egress_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Egress Exposure:
 hello-world/workload-a[Deployment] 	=> 	[namespace with {{Key:foo.com/managed-state,Operator:In,Values:[managed],}}]/[all pods] : TCP 8050

diff --git a/test_outputs/connlist/exposure_test_with_multiple_policies_1_exposure_output.txt b/test_outputs/connlist/exposure_test_with_multiple_policies_1_exposure_output.txt
@@ -1,3 +1,4 @@
+
 Exposure Analysis Result:
 Ingress Exposure:
 hello-world/workload-a[Deployment] 	<= 	[namespace with {{Key:env,Operator:In,Values:[env-1 env-2],},{Key:tier,Operator:Exists,Values:[],}}]/[all pods] : All Connections
diff --git a/test_outputs/connlist/ipblockstest_2_connlist_output.txt b/test_outputs/connlist/ipblockstest_2_connlist_output.txt
@@ -599,4 +599,4 @@ kube-system/vpn-858f6d9777[ReplicaSet] => kube-system-dummy-to-ignore/public-cre
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/calico-node[DaemonSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/heapster-7df8cb8c66[ReplicaSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-keepalived-watcher-for-demo[DaemonSet] : All Connections
-kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
+kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
diff --git a/test_outputs/connlist/ipblockstest_3_connlist_output.txt b/test_outputs/connlist/ipblockstest_3_connlist_output.txt
@@ -599,4 +599,4 @@ kube-system/vpn-858f6d9777[ReplicaSet] => kube-system-dummy-to-ignore/public-cre
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/calico-node[DaemonSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/heapster-7df8cb8c66[ReplicaSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-keepalived-watcher-for-demo[DaemonSet] : All Connections
-kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
+kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
diff --git a/test_outputs/connlist/ipblockstest_4_connlist_output.txt b/test_outputs/connlist/ipblockstest_4_connlist_output.txt
@@ -51990,4 +51990,4 @@ kube-system/vpn-858f6d9777[ReplicaSet] => 95.0.0.0-95.0.0.255 : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => 96.0.0.0-96.0.0.255 : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => 97.0.0.0-97.0.0.255 : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => 98.0.0.0-98.0.0.255 : All Connections
-kube-system/vpn-858f6d9777[ReplicaSet] => 99.0.0.0-99.0.0.255 : All Connections
+kube-system/vpn-858f6d9777[ReplicaSet] => 99.0.0.0-99.0.0.255 : All Connections
diff --git a/test_outputs/connlist/ipblockstest_connlist_output.txt b/test_outputs/connlist/ipblockstest_connlist_output.txt
@@ -599,4 +599,4 @@ kube-system/vpn-858f6d9777[ReplicaSet] => kube-system-dummy-to-ignore/public-cre
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/calico-node[DaemonSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/heapster-7df8cb8c66[ReplicaSet] : All Connections
 kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-keepalived-watcher-for-demo[DaemonSet] : All Connections
-kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
+kube-system/vpn-858f6d9777[ReplicaSet] => kube-system/ibm-kube-fluentd[DaemonSet] : All Connections
diff --git a/test_outputs/connlist/k8s_ingress_test_connlist_output.md b/test_outputs/connlist/k8s_ingress_test_connlist_output.md
@@ -42,4 +42,4 @@
 | default/reviews-v3-84779c7bbc[ReplicaSet] | default/ratings-v1-b6994bb9[ReplicaSet] | All Connections |
 | default/reviews-v3-84779c7bbc[ReplicaSet] | default/reviews-v1-545db77b95[ReplicaSet] | All Connections |
 | default/reviews-v3-84779c7bbc[ReplicaSet] | default/reviews-v2-7bf8c9648f[ReplicaSet] | All Connections |
-| {ingress-controller} | default/details-v1-79f774bdb9[ReplicaSet] | TCP 9080 |
+| {ingress-controller} | default/details-v1-79f774bdb9[ReplicaSet] | TCP 9080 |
diff --git a/test_outputs/connlist/k8s_ingress_test_connlist_output.txt b/test_outputs/connlist/k8s_ingress_test_connlist_output.txt
@@ -40,4 +40,4 @@ default/reviews-v3-84779c7bbc[ReplicaSet] => default/productpage-v1-6b746f74dc[R
 default/reviews-v3-84779c7bbc[ReplicaSet] => default/ratings-v1-b6994bb9[ReplicaSet] : All Connections
 default/reviews-v3-84779c7bbc[ReplicaSet] => default/reviews-v1-545db77b95[ReplicaSet] : All Connections
 default/reviews-v3-84779c7bbc[ReplicaSet] => default/reviews-v2-7bf8c9648f[ReplicaSet] : All Connections
-{ingress-controller} => default/details-v1-79f774bdb9[ReplicaSet] : TCP 9080
+{ingress-controller} => default/details-v1-79f774bdb9[ReplicaSet] : TCP 9080
diff --git a/...utputs/connlist/k8s_ingress_test_focus_workload_details-v1-79f774bdb9_connlist_output.txt b/...utputs/connlist/k8s_ingress_test_focus_workload_details-v1-79f774bdb9_connlist_output.txt
@@ -10,4 +10,4 @@ default/ratings-v1-b6994bb9[ReplicaSet] => default/details-v1-79f774bdb9[Replica
 default/reviews-v1-545db77b95[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
 default/reviews-v2-7bf8c9648f[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
 default/reviews-v3-84779c7bbc[ReplicaSet] => default/details-v1-79f774bdb9[ReplicaSet] : All Connections
-{ingress-controller} => default/details-v1-79f774bdb9[ReplicaSet] : TCP 9080
+{ingress-controller} => default/details-v1-79f774bdb9[ReplicaSet] : TCP 9080
diff --git a/test_outputs/connlist/minikube_resources_connlist_output.txt b/test_outputs/connlist/minikube_resources_connlist_output.txt
@@ -153,4 +153,4 @@ kube-system/storage-provisioner[Pod] => kube-system/etcd-minikube[Pod] : All Con
 kube-system/storage-provisioner[Pod] => kube-system/kube-apiserver-minikube[Pod] : All Connections
 kube-system/storage-provisioner[Pod] => kube-system/kube-controller-manager-minikube[Pod] : All Connections
 kube-system/storage-provisioner[Pod] => kube-system/kube-proxy[DaemonSet] : All Connections
-kube-system/storage-provisioner[Pod] => kube-system/kube-scheduler-minikube[Pod] : All Connections
+kube-system/storage-provisioner[Pod] => kube-system/kube-scheduler-minikube[Pod] : All Connections
diff --git a/test_outputs/connlist/minimal_test_in_ns_connlist_output.txt b/test_outputs/connlist/minimal_test_in_ns_connlist_output.txt
@@ -2,4 +2,4 @@
 hello-world/workload-a[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
 hello-world/workload-a[Deployment] => hello-world/workload-b[Deployment] : All Connections
 hello-world/workload-b[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
-hello-world/workload-b[Deployment] => hello-world/workload-a[Deployment] : TCP 8050
+hello-world/workload-b[Deployment] => hello-world/workload-a[Deployment] : TCP 8050
diff --git a/...tputs/connlist/multiple_ingress_objects_with_different_ports_connlist_output.md b/...tputs/connlist/multiple_ingress_objects_with_different_ports_connlist_output.md
@@ -2,4 +2,4 @@
 |-----|-----|------|
 | 0.0.0.0-255.255.255.255 | ingressworld/ingress-world-multiple-ports[Deployment] | All Connections |
 | ingressworld/ingress-world-multiple-ports[Deployment] | 0.0.0.0-255.255.255.255 | All Connections |
-| {ingress-controller} | ingressworld/ingress-world-multiple-ports[Deployment] | TCP 8050,8090 |
+| {ingress-controller} | ingressworld/ingress-world-multiple-ports[Deployment] | TCP 8050,8090 |
diff --git a/test_outputs/connlist/multiple_ingress_objects_with_different_ports_connlist_output.txt b/test_outputs/connlist/multiple_ingress_objects_with_different_ports_connlist_output.txt
@@ -1,3 +1,3 @@
 0.0.0.0-255.255.255.255 => ingressworld/ingress-world-multiple-ports[Deployment] : All Connections
 ingressworld/ingress-world-multiple-ports[Deployment] => 0.0.0.0-255.255.255.255 : All Connections
-{ingress-controller} => ingressworld/ingress-world-multiple-ports[Deployment] : TCP 8050,8090
+{ingress-controller} => ingressworld/ingress-world-multiple-ports[Deployment] : TCP 8050,8090
diff --git a/test_outputs/connlist/multiple_topology_resources_1_connlist_output.txt b/test_outputs/connlist/multiple_topology_resources_1_connlist_output.txt
@@ -552,4 +552,4 @@ vendor-system/foofoo-app[ReplicaSet] => kube-system/kube-fluentd[DaemonSet] : Al
 vendor-system/foofoo-app[ReplicaSet] => kube-system/storage-watcher-8494b4b8bb[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/tiller-deploy-5c45c9966b[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/vpn-858f6d9777[ReplicaSet] : All Connections
-vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
+vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
diff --git a/test_outputs/connlist/multiple_topology_resources_2_connlist_output.txt b/test_outputs/connlist/multiple_topology_resources_2_connlist_output.txt
@@ -552,4 +552,4 @@ vendor-system/foofoo-app[ReplicaSet] => kube-system/kube-fluentd[DaemonSet] : Al
 vendor-system/foofoo-app[ReplicaSet] => kube-system/storage-watcher-8494b4b8bb[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/tiller-deploy-5c45c9966b[ReplicaSet] : All Connections
 vendor-system/foofoo-app[ReplicaSet] => kube-system/vpn-858f6d9777[ReplicaSet] : All Connections
-vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
+vendor-system/foofoo-app[ReplicaSet] => vendor-system/barbar-app[ReplicaSet] : All Connections
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
		default/checkoutservice[Deployment] => default/emailservice[Deployment] : TCP 8080
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080
		{ingress-controller} => frontend/asset-cache[Deployment] : TCP 8080