Skip to content

Commit

Permalink
update TODOs and set tls min version
Browse files Browse the repository at this point in the history
  • Loading branch information
randmonkey committed Feb 8, 2023
1 parent 40fe004 commit d6afa98
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 2 additions & 3 deletions internal/konnect/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ var KicNodeAPIPathPattern = "%s/kic/api/runtime_groups/%s/v1/kic-nodes"

// NewClient creates a Konnect client.
func NewClient(cfg adminapi.KonnectConfig) (*Client, error) {
tlsConfig := tls.Config{ //nolint:gosec
Certificates: []tls.Certificate{},
tlsConfig := tls.Config{
MinVersion: tls.VersionTLS12,
}
cert, err := tlsutil.ExtractClientCertificates([]byte(cfg.TLSClient.Cert), cfg.TLSClient.CertFile, []byte(cfg.TLSClient.Key), cfg.TLSClient.KeyFile)
if err != nil {
Expand Down Expand Up @@ -81,7 +81,6 @@ func (c *Client) CreateNode(req *CreateNodeRequest) (*CreateNodeResponse, error)

if !isOKStatusCode(httpResp.StatusCode) {
return nil, fmt.Errorf("non-success response code from Koko: %d, resp body: %s", httpResp.StatusCode, string(respBuf))
// TODO: parse returned body to return a more detailed error
}

resp := &CreateNodeResponse{}
Expand Down
5 changes: 4 additions & 1 deletion internal/konnect/node_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ func NewNodeAgent(hostname string, version string, logger logr.Logger, client *C
Logger: logger.
WithName("konnect-node").WithValues("runtime_group_id", client.RuntimeGroupID),
konnectClient: client,
// TODO: set refresh interval by flags/envvar
// TODO: set refresh interval by some flag
// https://github.com/Kong/kubernetes-ingress-controller/issues/3515
refreshInterval: defaultRefreshNodeInterval,
}
}
Expand Down Expand Up @@ -78,6 +79,7 @@ func (a *NodeAgent) updateNode() error {
}

// TODO: retrieve the real state of KIC
// https://github.com/Kong/kubernetes-ingress-controller/issues/3515
ingressControllerStatus := IngressControllerStateOperational

updateNodeReq := &UpdateNodeRequest{
Expand All @@ -101,6 +103,7 @@ func (a *NodeAgent) updateNodeLoop() {
ticker := time.NewTicker(a.refreshInterval)
defer ticker.Stop()
// TODO: add some mechanism to break the loop
// https://github.com/Kong/kubernetes-ingress-controller/issues/3515
for range ticker.C {
err := a.updateNode()
if err != nil {
Expand Down

0 comments on commit d6afa98

Please sign in to comment.