From efb056309460c815f1e522ec3c7cbc11e8b5b56b Mon Sep 17 00:00:00 2001
From: Daman <aroradaman@gmail.com>
Date: Sun, 16 Apr 2023 15:52:52 +0530
Subject: [PATCH] proxy/conntrack: moved pkg/util/conntrack ->
 pkg/proxy/conntrack

---
 pkg/{util => proxy}/conntrack/conntrack.go      | 4 ++--
 pkg/{util => proxy}/conntrack/conntrack_test.go | 0
 pkg/proxy/iptables/proxier.go                   | 2 +-
 pkg/proxy/iptables/proxier_test.go              | 2 +-
 pkg/proxy/ipvs/proxier.go                       | 2 +-
 pkg/util/conntrack/OWNERS                       | 8 --------
 6 files changed, 5 insertions(+), 13 deletions(-)
 rename pkg/{util => proxy}/conntrack/conntrack.go (97%)
 rename pkg/{util => proxy}/conntrack/conntrack_test.go (100%)
 delete mode 100644 pkg/util/conntrack/OWNERS

diff --git a/pkg/util/conntrack/conntrack.go b/pkg/proxy/conntrack/conntrack.go
similarity index 97%
rename from pkg/util/conntrack/conntrack.go
rename to pkg/proxy/conntrack/conntrack.go
index 4b39f61ac79..450ca1dda3a 100644
--- a/pkg/util/conntrack/conntrack.go
+++ b/pkg/proxy/conntrack/conntrack.go
@@ -63,12 +63,12 @@ func Exec(execer exec.Interface, parameters ...string) error {
 	if err != nil {
 		return fmt.Errorf("error looking for path of conntrack: %v", err)
 	}
-	klog.V(4).Infof("Clearing conntrack entries %v", parameters)
+	klog.V(4).InfoS("Clearing conntrack entries", "parameters", parameters)
 	output, err := execer.Command(conntrackPath, parameters...).CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("conntrack command returned: %q, error message: %s", string(output), err)
 	}
-	klog.V(4).Infof("Conntrack entries deleted %s", string(output))
+	klog.V(4).InfoS("Conntrack entries deleted", "output", string(output))
 	return nil
 }
 
diff --git a/pkg/util/conntrack/conntrack_test.go b/pkg/proxy/conntrack/conntrack_test.go
similarity index 100%
rename from pkg/util/conntrack/conntrack_test.go
rename to pkg/proxy/conntrack/conntrack_test.go
diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go
index 4e5b7cb0791..f8a8ea7d803 100644
--- a/pkg/proxy/iptables/proxier.go
+++ b/pkg/proxy/iptables/proxier.go
@@ -44,13 +44,13 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/proxy"
+	"k8s.io/kubernetes/pkg/proxy/conntrack"
 	"k8s.io/kubernetes/pkg/proxy/healthcheck"
 	"k8s.io/kubernetes/pkg/proxy/metaproxier"
 	"k8s.io/kubernetes/pkg/proxy/metrics"
 	utilproxy "k8s.io/kubernetes/pkg/proxy/util"
 	proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables"
 	"k8s.io/kubernetes/pkg/util/async"
-	"k8s.io/kubernetes/pkg/util/conntrack"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	utilexec "k8s.io/utils/exec"
 	netutils "k8s.io/utils/net"
diff --git a/pkg/proxy/iptables/proxier_test.go b/pkg/proxy/iptables/proxier_test.go
index 7e2793145bb..374fb321330 100644
--- a/pkg/proxy/iptables/proxier_test.go
+++ b/pkg/proxy/iptables/proxier_test.go
@@ -44,6 +44,7 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/proxy"
+	"k8s.io/kubernetes/pkg/proxy/conntrack"
 	"k8s.io/kubernetes/pkg/proxy/metrics"
 
 	"k8s.io/kubernetes/pkg/proxy/healthcheck"
@@ -51,7 +52,6 @@ import (
 	proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables"
 	utilproxytest "k8s.io/kubernetes/pkg/proxy/util/testing"
 	"k8s.io/kubernetes/pkg/util/async"
-	"k8s.io/kubernetes/pkg/util/conntrack"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing"
 	"k8s.io/utils/exec"
diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go
index 7d40b4c91d7..e348f41cd07 100644
--- a/pkg/proxy/ipvs/proxier.go
+++ b/pkg/proxy/ipvs/proxier.go
@@ -43,13 +43,13 @@ import (
 	"k8s.io/client-go/tools/events"
 	utilsysctl "k8s.io/component-helpers/node/util/sysctl"
 	"k8s.io/kubernetes/pkg/proxy"
+	"k8s.io/kubernetes/pkg/proxy/conntrack"
 	"k8s.io/kubernetes/pkg/proxy/healthcheck"
 	"k8s.io/kubernetes/pkg/proxy/metaproxier"
 	"k8s.io/kubernetes/pkg/proxy/metrics"
 	utilproxy "k8s.io/kubernetes/pkg/proxy/util"
 	proxyutiliptables "k8s.io/kubernetes/pkg/proxy/util/iptables"
 	"k8s.io/kubernetes/pkg/util/async"
-	"k8s.io/kubernetes/pkg/util/conntrack"
 	utilipset "k8s.io/kubernetes/pkg/util/ipset"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	utilipvs "k8s.io/kubernetes/pkg/util/ipvs"
diff --git a/pkg/util/conntrack/OWNERS b/pkg/util/conntrack/OWNERS
deleted file mode 100644
index 675d11afb44..00000000000
--- a/pkg/util/conntrack/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-# See the OWNERS docs at https://go.k8s.io/owners
-
-approvers:
-  - sig-network-approvers
-reviewers:
-  - sig-network-reviewers
-labels:
-  - sig/network