@@ -14,11 +14,12 @@ import (
1414 "encoding/pem"
1515 "flag"
1616 "fmt"
17- "log"
1817 "os"
1918 "path/filepath"
2019 "time"
2120
21+ "github.com/rs/zerolog/log"
22+
2223 "gopkg.in/yaml.v2"
2324 certificates "k8s.io/api/certificates/v1"
2425 v1core "k8s.io/api/core/v1"
@@ -80,12 +81,12 @@ func initKubeClient() (*kubernetes.Clientset, clientcmd.ClientConfig, error) {
8081 kubeConfig := clientcmd .NewNonInteractiveDeferredLoadingClientConfig (loadingRules , & clientcmd.ConfigOverrides {})
8182 config , err := kubeConfig .ClientConfig ()
8283 if err != nil {
83- log .Fatal ("initKubeClient: failed creating ClientConfig with" , err )
84+ log .Printf ("initKubeClient: failed creating ClientConfig with" , err )
8485 return nil , nil , err
8586 }
8687 clientset , err := kubernetes .NewForConfig (config )
8788 if err != nil {
88- log .Fatal ("initKubeClient: failed creating Clientset with" , err )
89+ log .Printf ("initKubeClient: failed creating Clientset with" , err )
8990 return nil , nil , err
9091 }
9192 return clientset , kubeConfig , nil
@@ -110,8 +111,8 @@ func main() {
110111
111112 key , err := rsa .GenerateKey (rand .Reader , 1024 )
112113 if err != nil {
113- fmt . Println ("Error Generating key" )
114- log .Fatal ( fmt . Printf ("Error %s" , err ) )
114+ log . Print ("Error Generating key" )
115+ log .Printf ("Error %s" , err )
115116 }
116117 keyDer := x509 .MarshalPKCS1PrivateKey (key )
117118
@@ -121,23 +122,23 @@ func main() {
121122 }
122123 asn1 , err := asn1 .Marshal (subject .ToRDNSequence ())
123124 if err != nil {
124- fmt . Println ("Error marshalling ASN" )
125- log .Fatal ( fmt . Printf ("Error %s" , err ) )
125+ log . Print ("Error marshalling ASN" )
126+ log .Printf ("Error %s" , err )
126127 }
127128 csrReq := x509.CertificateRequest {
128129 RawSubject : asn1 ,
129130 SignatureAlgorithm : x509 .SHA256WithRSA ,
130131 }
131132 bytes , err := x509 .CreateCertificateRequest (rand .Reader , & csrReq , key )
132133 if err != nil {
133- fmt . Println ("Error Creating Certificate Request" )
134- log .Fatal ( fmt . Printf ("Error %s" , err ) )
134+ log . Print ("Error Creating Certificate Request" )
135+ log .Printf ("Error %s" , err )
135136 }
136137
137138 clientset , config , err := initKubeClient ()
138139 if err != nil {
139140 fmt .Println ("Error initializing Kubernetes client" )
140- log .Fatal ( fmt . Printf ("Error %s" , err ) )
141+ log .Printf ("Error %s" , err )
141142 }
142143 csr := & certificates.CertificateSigningRequest {
143144 ObjectMeta : v1.ObjectMeta {
@@ -160,8 +161,8 @@ func main() {
160161 }
161162 _ , err = clientset .CertificatesV1 ().CertificateSigningRequests ().Create (context .TODO (), csr , v1.CreateOptions {})
162163 if err != nil {
163- fmt . Println ("Error Creating CSR Object. Are you running on a cluste < 1.19? This only works with 1.19+" )
164- log .Fatal ( fmt . Printf ("Error %s" , err ) )
164+ log . Print ("Error Creating CSR Object. Are you running on a cluste < 1.19? This only works with 1.19+" )
165+ log .Printf ("Error %s" , err )
165166 }
166167 csr .Status .Conditions = append (csr .Status .Conditions , certificates.CertificateSigningRequestCondition {
167168 Type : certificates .CertificateApproved ,
@@ -173,21 +174,21 @@ func main() {
173174 csr , err = clientset .CertificatesV1 ().CertificateSigningRequests ().UpdateApproval (context .Background (), "tempcsr" , csr , v1.UpdateOptions {})
174175 if err != nil {
175176 fmt .Println ("Error Approving Certificate" )
176- log .Fatal ( fmt . Printf ("Error %s" , err ) )
177+ log .Printf ("Error %s" , err )
177178 }
178179 // Give the API server a couple of seconds to issue the cert.
179180 time .Sleep (2 * time .Second )
180181 csr , _ = clientset .CertificatesV1 ().CertificateSigningRequests ().Get (context .TODO (), csr .GetName (), v1.GetOptions {})
181182 pb , _ := pem .Decode (csr .Status .Certificate )
182183 if pb == nil {
183- fmt . Println ("Error issuing cert, are you trying this with EKS?" )
184+ log . Print ("Error issuing cert, are you trying this with EKS?" )
184185 _ = clientset .CertificatesV1 ().CertificateSigningRequests ().Delete (context .TODO (), csr .GetName (), v1.DeleteOptions {})
185- log .Fatal (err )
186+ log .Print (err )
186187 }
187188 issued_cert , err := x509 .ParseCertificate (pb .Bytes )
188189 if err != nil {
189- fmt . Println ("Error Parsing Certificate" )
190- log .Fatal (err )
190+ log . Print ("Error Parsing Certificate" )
191+ log .Print (err )
191192 }
192193 issued_group := "none"
193194 if issued_cert .Subject .Organization [0 ] != "" {
@@ -197,8 +198,8 @@ func main() {
197198
198199 raw , err := config .RawConfig ()
199200 if err != nil {
200- fmt . Println ("error getting raw config" )
201- log .Fatal (err )
201+ log . Print ("error getting raw config" )
202+ log .Print (err )
202203 }
203204 cluster := raw .Contexts [raw .CurrentContext ].Cluster
204205
@@ -237,25 +238,25 @@ func main() {
237238
238239 dir , err := os .Getwd ()
239240 if err != nil {
240- fmt . Println ("Error Getting working directory" )
241- log .Fatal (err )
241+ log . Print ("Error Getting working directory" )
242+ log .Print (err )
242243 }
243244 _ , err = os .Create (filepath .Join (dir , * outputFile ))
244245 if err != nil {
245- fmt . Println ("Error Creating output file" )
246- log .Fatal (err )
246+ log . Print ("Error Creating output file" )
247+ log .Print (err )
247248 }
248249 file , err := os .OpenFile (* outputFile , os .O_APPEND | os .O_WRONLY , os .ModeAppend )
249250 if err != nil {
250- fmt . Println ("Error opening output file" )
251- log .Fatal (err )
251+ log . Print ("Error opening output file" )
252+ log .Print (err )
252253 }
253254 defer file .Close ()
254255 e := yaml .NewEncoder (file )
255256 err = e .Encode (kc )
256257 if err != nil {
257- fmt . Println ("Error encoding Kubeconfig YAML" )
258- log .Fatal (err )
258+ log . Print ("Error encoding Kubeconfig YAML" )
259+ log .Print (err )
259260 }
260261 clientset .CertificatesV1 ().CertificateSigningRequests ().Delete (context .TODO (), csr .GetName (), v1.DeleteOptions {})
261262
0 commit comments