updated error handling

Author: raesene

main.go

@@ -1,5 +1,6 @@
+// This program generates Kubeconfig files based on the CSR API.
 // Based on Code from https://medium.com/@elfakharany/automate-kubernetes-user-creation-using-the-native-go-client-e2d20dcdc9de
-// Updated to take account of change API versions
+// Updated to take account of change API versions.
 
 package main
 
@@ -18,7 +19,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/rs/zerolog/log"
+	"log"
 
 	"gopkg.in/yaml.v2"
 	certificates "k8s.io/api/certificates/v1"
@@ -81,12 +82,12 @@ func initKubeClient() (*kubernetes.Clientset, clientcmd.ClientConfig, error) {
 	kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})
 	config, err := kubeConfig.ClientConfig()
 	if err != nil {
-		log.Printf("initKubeClient: failed creating ClientConfig with", err)
+		log.Printf("initKubeClient: failed creating ClientConfig with %s", err)
 		return nil, nil, err
 	}
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
-		log.Printf("initKubeClient: failed creating Clientset with", err)
+		log.Printf("initKubeClient: failed creating Clientset with %s", err)
 		return nil, nil, err
 	}
 	return clientset, kubeConfig, nil
@@ -111,8 +112,7 @@ func main() {
 
 	key, err := rsa.GenerateKey(rand.Reader, 1024)
 	if err != nil {
-		log.Print("Error Generating key")
-		log.Printf("Error %s", err)
+		log.Fatalf("Error Generating key : %s", err)
 	}
 	keyDer := x509.MarshalPKCS1PrivateKey(key)
 
@@ -131,14 +131,12 @@ func main() {
 	}
 	bytes, err := x509.CreateCertificateRequest(rand.Reader, &csrReq, key)
 	if err != nil {
-		log.Print("Error Creating Certificate Request")
-		log.Printf("Error %s", err)
+		log.Fatalf("Error Creating Certificate Request %s", err)
 	}
 
 	clientset, config, err := initKubeClient()
 	if err != nil {
-		fmt.Println("Error initializing Kubernetes client")
-		log.Printf("Error %s", err)
+		log.Fatalf("Error initializing Kubeclient %s", err)
 	}
 	csr := &certificates.CertificateSigningRequest{
 		ObjectMeta: v1.ObjectMeta{
@@ -162,7 +160,7 @@ func main() {
 	_, err = clientset.CertificatesV1().CertificateSigningRequests().Create(context.TODO(), csr, v1.CreateOptions{})
 	if err != nil {
 		log.Print("Error Creating CSR Object. Are you running on a cluste < 1.19? This only works with 1.19+")
-		log.Printf("Error %s", err)
+		log.Fatalf("Error %s", err)
 	}
 	csr.Status.Conditions = append(csr.Status.Conditions, certificates.CertificateSigningRequestCondition{
 		Type:           certificates.CertificateApproved,
@@ -173,8 +171,7 @@ func main() {
 	})
 	csr, err = clientset.CertificatesV1().CertificateSigningRequests().UpdateApproval(context.Background(), "tempcsr", csr, v1.UpdateOptions{})
 	if err != nil {
-		fmt.Println("Error Approving Certificate")
-		log.Printf("Error %s", err)
+		log.Fatalf("Error Approving Certificate :  %s", err)
 	}
 	// Give the API server a couple of seconds to issue the cert.
 	time.Sleep(2 * time.Second)
@@ -187,8 +184,7 @@ func main() {
 	}
 	issued_cert, err := x509.ParseCertificate(pb.Bytes)
 	if err != nil {
-		log.Print("Error Parsing Certificate")
-		log.Print(err)
+		log.Fatalf("Error Parsing Certificate %s", err)
 	}
 	issued_group := "none"
 	if issued_cert.Subject.Organization[0] != "" {
@@ -198,8 +194,7 @@ func main() {
 
 	raw, err := config.RawConfig()
 	if err != nil {
-		log.Print("error getting raw config")
-		log.Print(err)
+		log.Fatalf("error getting raw config %s", err)
 	}
 	cluster := raw.Contexts[raw.CurrentContext].Cluster
 
@@ -238,25 +233,21 @@ func main() {
 
 	dir, err := os.Getwd()
 	if err != nil {
-		log.Print("Error Getting working directory")
-		log.Print(err)
+		log.Fatalf("Error Getting working directory %s", err)
 	}
 	_, err = os.Create(filepath.Join(dir, *outputFile))
 	if err != nil {
-		log.Print("Error Creating output file")
-		log.Print(err)
+		log.Fatalf("Error Creating output file %s", err)
 	}
 	file, err := os.OpenFile(*outputFile, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
 	if err != nil {
-		log.Print("Error opening output file")
-		log.Print(err)
+		log.Fatalf("Error opening output file %s", err)
 	}
 	defer file.Close()
 	e := yaml.NewEncoder(file)
 	err = e.Encode(kc)
 	if err != nil {
-		log.Print("Error encoding Kubeconfig YAML")
-		log.Print(err)
+		log.Fatalf("Error encoding Kubeconfig YAML %s", err)
 	}
 	clientset.CertificatesV1().CertificateSigningRequests().Delete(context.TODO(), csr.GetName(), v1.DeleteOptions{})