Add pkg to Dockerfile and Fix TLS issue (#67)

Author: HomayoonAlimohammadi

Dockerfile

@@ -15,6 +15,7 @@ RUN go mod download
 COPY main.go main.go
 COPY api/ api/
 COPY controllers/ controllers/
+COPY pkg/ pkg/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$arch go build -a -ldflags '-s -w' -o manager main.go

pkg/clusteragent/clusteragent.go

@@ -19,9 +19,6 @@ import (
 type Options struct {
 	// IgnoreMachineNames is a set of ignored machine names that we don't want to pick their IP for the cluster agent endpoint.
 	IgnoreMachineNames sets.String
-	// InsecureSkipVerify skips the verification of the server's certificate chain and host name.
-	// This is mostly used for testing purposes.
-	InsecureSkipVerify bool
 }
 
 type Client struct {
@@ -51,18 +48,19 @@ func NewClient(machines []clusterv1.Machine, port string, timeout time.Duration,
 		return nil, errors.New("failed to find an IP for cluster agent")
 	}
 
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: opts.InsecureSkipVerify,
-		},
-	}
-
 	return &Client{
 		ip:   ip,
 		port: port,
 		client: &http.Client{
-			Timeout:   timeout,
-			Transport: transport,
+			Timeout: timeout,
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					// TODO(Hue): Workaround for now, address later on
+					// get the certificate fingerprint from the matching node through a resource in the cluster (TBD),
+					//  and validate it in the TLSClientConfig
+					InsecureSkipVerify: true,
+				},
+			},
 		},
 	}, nil
 }

pkg/clusteragent/clusteragent_test.go

@@ -145,7 +145,7 @@ func TestDo(t *testing.T) {
 				},
 			},
 		},
-	}, port, time.Second, clusteragent.Options{InsecureSkipVerify: true})
+	}, port, time.Second, clusteragent.Options{})
 
 	g.Expect(err).ToNot(HaveOccurred())
 

pkg/clusteragent/remove_node_test.go

@@ -34,7 +34,7 @@ func TestRemoveFromDqlite(t *testing.T) {
 				},
 			},
 		},
-	}, port, time.Second, clusteragent.Options{InsecureSkipVerify: true})
+	}, port, time.Second, clusteragent.Options{})
 
 	g.Expect(err).ToNot(HaveOccurred())
 	g.Expect(c.RemoveNodeFromDqlite(context.Background(), "1.1.1.1:1234")).To(Succeed())