From 303593cafe1163f0813948f42c9e0f7561017c8f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sun, 15 Dec 2024 10:49:39 -0500 Subject: [PATCH] Fix some pkg/proxy comments Remove a bunch of comments that are either inaccurate ("the proxier can only be tested by e2e tests") or weirdly overspecific about obvious details ("the proxier will not exit if an iptables call fails"). --- pkg/proxy/iptables/proxier.go | 13 ++----------- pkg/proxy/ipvs/proxier.go | 9 ++------- pkg/proxy/nftables/proxier.go | 10 ++-------- pkg/proxy/winkernel/proxier.go | 5 ++--- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 9e3ea0ade9e..80c00cd53a5 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -19,10 +19,6 @@ limitations under the License. package iptables -// -// NOTE: this needs to be tested in e2e since it uses iptables for everything. -// - import ( "bytes" "context" @@ -135,8 +131,7 @@ func NewDualStackProxier( return metaproxier.NewMetaProxier(ipv4Proxier, ipv6Proxier), nil } -// Proxier is an iptables based proxy for connections between a localhost:lport -// and services that provide the actual backends. +// Proxier is an iptables-based proxy type Proxier struct { // ipFamily defines the IP family which this proxier is tracking. ipFamily v1.IPFamily @@ -218,11 +213,7 @@ type Proxier struct { // Proxier implements proxy.Provider var _ proxy.Provider = &Proxier{} -// NewProxier returns a new Proxier given an iptables Interface instance. -// Because of the iptables logic, it is assumed that there is only a single Proxier active on a machine. -// An error will be returned if iptables fails to update or acquire the initial lock. -// Once a proxier is created, it will keep iptables up to date in the background and -// will not terminate if a particular iptables call fails. +// NewProxier returns a new single-stack IPTables proxier. func NewProxier(ctx context.Context, ipFamily v1.IPFamily, ipt utiliptables.Interface, diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index c035b150491..c83a3cad5ee 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -159,8 +159,7 @@ func NewDualStackProxier( return metaproxier.NewMetaProxier(ipv4Proxier, ipv6Proxier), nil } -// Proxier is an ipvs based proxy for connections between a localhost:lport -// and services that provide the actual backends. +// Proxier is an ipvs-based proxy type Proxier struct { // the ipfamily on which this proxy is operating on. ipFamily v1.IPFamily @@ -254,11 +253,7 @@ type Proxier struct { // Proxier implements proxy.Provider var _ proxy.Provider = &Proxier{} -// NewProxier returns a new Proxier given an iptables and ipvs Interface instance. -// Because of the iptables and ipvs logic, it is assumed that there is only a single Proxier active on a machine. -// An error will be returned if it fails to update or acquire the initial lock. -// Once a proxier is created, it will keep iptables and ipvs rules up to date in the background and -// will not terminate if a particular iptables or ipvs call fails. +// NewProxier returns a new single-stack IPVS proxier. func NewProxier( ctx context.Context, ipFamily v1.IPFamily, diff --git a/pkg/proxy/nftables/proxier.go b/pkg/proxy/nftables/proxier.go index d7d8976664e..a5f2ce96334 100644 --- a/pkg/proxy/nftables/proxier.go +++ b/pkg/proxy/nftables/proxier.go @@ -19,10 +19,6 @@ limitations under the License. package nftables -// -// NOTE: this needs to be tested in e2e since it uses nftables for everything. -// - import ( "context" "crypto/sha256" @@ -143,7 +139,7 @@ func NewDualStackProxier( return metaproxier.NewMetaProxier(ipv4Proxier, ipv6Proxier), nil } -// Proxier is an nftables based proxy +// Proxier is an nftables-based proxy type Proxier struct { // ipFamily defines the IP family which this proxier is tracking. ipFamily v1.IPFamily @@ -211,9 +207,7 @@ type Proxier struct { // Proxier implements proxy.Provider var _ proxy.Provider = &Proxier{} -// NewProxier returns a new nftables Proxier. Once a proxier is created, it will keep -// nftables up to date in the background and will not terminate if a particular nftables -// call fails. +// NewProxier returns a new single-stack NFTables proxier. func NewProxier(ctx context.Context, ipFamily v1.IPFamily, syncPeriod time.Duration, diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index a4e57dd36e2..4558014331f 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -623,8 +623,7 @@ func (network hnsNetworkInfo) findRemoteSubnetProviderAddress(ip string) string type endPointsReferenceCountMap map[string]*uint16 -// Proxier is an hns based proxy for connections between a localhost:lport -// and services that provide the actual backends. +// Proxier is an HNS-based proxy type Proxier struct { // ipFamily defines the IP family which this proxier is tracking. ipFamily v1.IPFamily @@ -701,7 +700,7 @@ type closeable interface { // Proxier implements proxy.Provider var _ proxy.Provider = &Proxier{} -// NewProxier returns a new Proxier +// NewProxier returns a new single-stack winkernel proxier. func NewProxier( ipFamily v1.IPFamily, syncPeriod time.Duration,