Changes to accommodate client-go changes and kube vendor update

to v1.18.0

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>

vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/client.go

@@ -0,0 +1,195 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"context"
+	"errors"
+	"io"
+	"math/rand"
+	"net"
+	"sync"
+	"time"
+
+	"google.golang.org/grpc"
+	"k8s.io/klog"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client"
+)
+
+// Tunnel provides ability to dial a connection through a tunnel.
+type Tunnel interface {
+	// Dial connects to the address on the named network, similar to
+	// what net.Dial does. The only supported protocol is tcp.
+	Dial(protocol, address string) (net.Conn, error)
+}
+
+type dialResult struct {
+	err    string
+	connid int64
+}
+
+// grpcTunnel implements Tunnel
+type grpcTunnel struct {
+	stream          client.ProxyService_ProxyClient
+	pendingDial     map[int64]chan<- dialResult
+	conns           map[int64]*conn
+	pendingDialLock sync.RWMutex
+	connsLock       sync.RWMutex
+}
+
+// CreateGrpcTunnel creates a Tunnel to dial to a remote server through a
+// gRPC based proxy service.
+func CreateGrpcTunnel(address string, opts ...grpc.DialOption) (Tunnel, error) {
+	c, err := grpc.Dial(address, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	grpcClient := client.NewProxyServiceClient(c)
+
+	stream, err := grpcClient.Proxy(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
+	tunnel := &grpcTunnel{
+		stream:      stream,
+		pendingDial: make(map[int64]chan<- dialResult),
+		conns:       make(map[int64]*conn),
+	}
+
+	go tunnel.serve()
+
+	return tunnel, nil
+}
+
+func (t *grpcTunnel) serve() {
+	for {
+		pkt, err := t.stream.Recv()
+		if err == io.EOF {
+			return
+		}
+		if err != nil || pkt == nil {
+			klog.Warningf("stream read error: %v", err)
+			return
+		}
+
+		klog.V(6).Infof("[tracing] recv packet, type: %s", pkt.Type)
+
+		switch pkt.Type {
+		case client.PacketType_DIAL_RSP:
+			resp := pkt.GetDialResponse()
+			t.pendingDialLock.RLock()
+			ch, ok := t.pendingDial[resp.Random]
+			t.pendingDialLock.RUnlock()
+
+			if !ok {
+				klog.Warning("DialResp not recognized; dropped")
+			} else {
+				ch <- dialResult{
+					err:    resp.Error,
+					connid: resp.ConnectID,
+				}
+			}
+		case client.PacketType_DATA:
+			resp := pkt.GetData()
+			// TODO: flow control
+			t.connsLock.RLock()
+			conn, ok := t.conns[resp.ConnectID]
+			t.connsLock.RUnlock()
+
+			if ok {
+				conn.readCh <- resp.Data
+			} else {
+				klog.Warningf("connection id %d not recognized", resp.ConnectID)
+			}
+		case client.PacketType_CLOSE_RSP:
+			resp := pkt.GetCloseResponse()
+			t.connsLock.RLock()
+			conn, ok := t.conns[resp.ConnectID]
+			t.connsLock.RUnlock()
+
+			if ok {
+				close(conn.readCh)
+				conn.closeCh <- resp.Error
+				close(conn.closeCh)
+				t.connsLock.Lock()
+				delete(t.conns, resp.ConnectID)
+				t.connsLock.Unlock()
+			} else {
+				klog.Warningf("connection id %d not recognized", resp.ConnectID)
+			}
+		}
+	}
+}
+
+// Dial connects to the address on the named network, similar to
+// what net.Dial does. The only supported protocol is tcp.
+func (t *grpcTunnel) Dial(protocol, address string) (net.Conn, error) {
+	if protocol != "tcp" {
+		return nil, errors.New("protocol not supported")
+	}
+
+	random := rand.Int63()
+	resCh := make(chan dialResult)
+	t.pendingDialLock.Lock()
+	t.pendingDial[random] = resCh
+	t.pendingDialLock.Unlock()
+	defer func() {
+		t.pendingDialLock.Lock()
+		delete(t.pendingDial, random)
+		t.pendingDialLock.Unlock()
+	}()
+
+	req := &client.Packet{
+		Type: client.PacketType_DIAL_REQ,
+		Payload: &client.Packet_DialRequest{
+			DialRequest: &client.DialRequest{
+				Protocol: protocol,
+				Address:  address,
+				Random:   random,
+			},
+		},
+	}
+	klog.V(6).Infof("[tracing] send packet, type: %s", req.Type)
+
+	err := t.stream.Send(req)
+	if err != nil {
+		return nil, err
+	}
+
+	klog.Info("DIAL_REQ sent to proxy server")
+
+	c := &conn{stream: t.stream}
+
+	select {
+	case res := <-resCh:
+		if res.err != "" {
+			return nil, errors.New(res.err)
+		}
+		c.connID = res.connid
+		c.readCh = make(chan []byte, 10)
+		c.closeCh = make(chan string)
+		t.connsLock.Lock()
+		t.conns[res.connid] = c
+		t.connsLock.Unlock()
+	case <-time.After(30 * time.Second):
+		return nil, errors.New("dial timeout")
+	}
+
+	return c, nil
+}

vendor/sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/conn.go

@@ -0,0 +1,141 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"errors"
+	"io"
+	"net"
+	"time"
+
+	"k8s.io/klog"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client"
+)
+
+// CloseTimeout is the timeout to wait CLOSE_RSP packet after a
+// successful delivery of CLOSE_REQ.
+const CloseTimeout = 10 * time.Second
+
+// conn is an implementation of net.Conn, where the data is transported
+// over an established tunnel defined by a gRPC service ProxyService.
+type conn struct {
+	stream  client.ProxyService_ProxyClient
+	connID  int64
+	readCh  chan []byte
+	closeCh chan string
+	rdata   []byte
+}
+
+var _ net.Conn = &conn{}
+
+// Write sends the data thru the connection over proxy service
+func (c *conn) Write(data []byte) (n int, err error) {
+	req := &client.Packet{
+		Type: client.PacketType_DATA,
+		Payload: &client.Packet_Data{
+			Data: &client.Data{
+				ConnectID: c.connID,
+				Data:      data,
+			},
+		},
+	}
+
+	klog.V(6).Infof("[tracing] send req, type: %s", req.Type)
+
+	err = c.stream.Send(req)
+	if err != nil {
+		return 0, err
+	}
+	return len(data), err
+}
+
+// Read receives data from the connection over proxy service
+func (c *conn) Read(b []byte) (n int, err error) {
+	var data []byte
+
+	if c.rdata != nil {
+		data = c.rdata
+	} else {
+		data = <-c.readCh
+	}
+
+	if data == nil {
+		return 0, io.EOF
+	}
+
+	if len(data) > len(b) {
+		copy(b, data[:len(b)])
+		c.rdata = data[len(b):]
+		return len(b), nil
+	}
+
+	c.rdata = nil
+	copy(b, data)
+
+	return len(data), nil
+}
+
+func (c *conn) LocalAddr() net.Addr {
+	return nil
+}
+
+func (c *conn) RemoteAddr() net.Addr {
+	return nil
+}
+
+func (c *conn) SetDeadline(t time.Time) error {
+	return errors.New("not implemented")
+}
+
+func (c *conn) SetReadDeadline(t time.Time) error {
+	return errors.New("not implemented")
+}
+
+func (c *conn) SetWriteDeadline(t time.Time) error {
+	return errors.New("not implemented")
+}
+
+// Close closes the connection. It also sends CLOSE_REQ packet over
+// proxy service to notify remote to drop the connection.
+func (c *conn) Close() error {
+	klog.Info("conn.Close()")
+	req := &client.Packet{
+		Type: client.PacketType_CLOSE_REQ,
+		Payload: &client.Packet_CloseRequest{
+			CloseRequest: &client.CloseRequest{
+				ConnectID: c.connID,
+			},
+		},
+	}
+
+	klog.V(6).Infof("[tracing] send req, type: %s", req.Type)
+
+	if err := c.stream.Send(req); err != nil {
+		return err
+	}
+
+	select {
+	case errMsg := <-c.closeCh:
+		if errMsg != "" {
+			return errors.New(errMsg)
+		}
+		return nil
+	case <-time.After(CloseTimeout):
+	}
+
+	return errors.New("close timeout")
+}