Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 KubeadmControlPlane internal/proxy should use pointer structs #5161

Merged
merged 1 commit into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/proxy/addr.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (a Addr) String() string {
}

// NewAddrFromConn creates an Addr from the given connection.
func NewAddrFromConn(c Conn) Addr {
func NewAddrFromConn(c *Conn) Addr {
return Addr{
port: c.stream.Headers().Get(corev1.PortHeader),
identifier: c.stream.Identifier(),
Expand Down
18 changes: 9 additions & 9 deletions controlplane/kubeadm/internal/proxy/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,40 @@ type Conn struct {
}

// Read from the connection.
func (c Conn) Read(b []byte) (n int, err error) {
func (c *Conn) Read(b []byte) (n int, err error) {
return c.stream.Read(b)
}

// Close the underlying proxied connection.
func (c Conn) Close() error {
func (c *Conn) Close() error {
return kerrors.NewAggregate([]error{c.stream.Close(), c.connection.Close()})
}

// Write to the connection.
func (c Conn) Write(b []byte) (n int, err error) {
func (c *Conn) Write(b []byte) (n int, err error) {
return c.stream.Write(b)
}

// LocalAddr returns a fake address representing the proxied connection.
func (c Conn) LocalAddr() net.Addr {
func (c *Conn) LocalAddr() net.Addr {
return NewAddrFromConn(c)
}

// RemoteAddr returns a fake address representing the proxied connection.
func (c Conn) RemoteAddr() net.Addr {
func (c *Conn) RemoteAddr() net.Addr {
return NewAddrFromConn(c)
}

// SetDeadline sets the read and write deadlines to the specified interval.
func (c Conn) SetDeadline(t time.Time) error {
func (c *Conn) SetDeadline(t time.Time) error {
// TODO: Handle deadlines
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@randomvariable Can you clarify what needs to be done here?

c.readDeadline = t
c.writeDeadline = t
Comment on lines 63 to 64
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These assignments were ineffective before this change.

return nil
}

// SetWriteDeadline sets the read and write deadlines to the specified interval.
func (c Conn) SetWriteDeadline(t time.Time) error {
func (c *Conn) SetWriteDeadline(t time.Time) error {
c.writeDeadline = t
return nil
}
Expand All @@ -79,8 +79,8 @@ func (c Conn) SetReadDeadline(t time.Time) error {

// NewConn creates a new net/conn interface based on an underlying Kubernetes
// API server proxy connection.
func NewConn(connection httpstream.Connection, stream httpstream.Stream) Conn {
return Conn{
func NewConn(connection httpstream.Connection, stream httpstream.Stream) *Conn {
return &Conn{
connection: connection,
stream: stream,
}
Expand Down