Clean up kind collect logs code

Signed-off-by: JoshVanL <[email protected]>

Author: JoshVanL

test/kind/kind.go

@@ -130,26 +130,13 @@ func DeleteCluster(name string) error {
 }
 
 func (k *Kind) Destroy() error {
-	log.Infof("kind: destroying cluster %q", clusterName)
-
-	provider := cluster.NewProvider()
-	logDir := filepath.Join(k.rootPath, "artifacts", "logs")
-
-	if err := os.RemoveAll(logDir); err != nil {
-		log.Errorf("kind: failed to remove old logs directory: %s", err)
-	} else {
-		if err := os.MkdirAll(logDir, 0755); err != nil {
-			log.Errorf("kind: failed to create logs directory: %s", err)
-		} else {
-			if err := provider.CollectLogs(clusterName, logDir); err != nil {
-				log.Errorf("kind: failed to collect logs: %s", err)
-			} else {
-				log.Infof("kind: collected logs at %q", logDir)
-			}
-		}
+	if err := k.collectLogs(); err != nil {
+		// Don't hard fail here as we should still attempt to delete the cluster
+		log.Errorf("kind: failed to collect logs: %s", err)
 	}
 
 	log.Infof("kind: destroying cluster %q", clusterName)
+
 	if err := DeleteCluster(clusterName); err != nil {
 		return fmt.Errorf("failed to delete kind cluster: %s", err)
 	}
@@ -163,6 +150,29 @@ func (k *Kind) Destroy() error {
 	return nil
 }
 
+func (k *Kind) collectLogs() error {
+	provider := cluster.NewProvider()
+	logDir := filepath.Join(k.rootPath, "artifacts", "logs")
+
+	log.Infof("kind: collecting logs to %q", logDir)
+
+	if err := os.RemoveAll(logDir); err != nil {
+		return fmt.Errorf("failed to remove old logs directory: %s", err)
+	}
+
+	if err := os.MkdirAll(logDir, 0755); err != nil {
+		return fmt.Errorf("failed to create logs directory: %s", err)
+	}
+
+	if err := provider.CollectLogs(clusterName, logDir); err != nil {
+		return fmt.Errorf("failed to collect logs: %s", err)
+	}
+
+	log.Infof("kind: collected logs at %q", logDir)
+
+	return nil
+}
+
 func (k *Kind) KubeClient() *kubernetes.Clientset {
 	return k.client
 }

test/util/tls.go

@@ -26,8 +26,6 @@ const (
 	prefix = "kube-oidc-proxy"
 )
 
-//TODO: move me to test/util
-
 func NewTLSSelfSignedCertKey(host string, netIPs []net.IP, dnsNames []string) (*KeyBundle, error) {
 	certBytes, keyBytes, err := cert.GenerateSelfSignedCertKey(host, netIPs, dnsNames)
 	if err != nil {