Add timer to certpoolwatcher

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

internal/shared/util/http/certpoolwatcher.go

@@ -21,6 +21,7 @@ type CertPoolWatcher struct {
 	log        logr.Logger
 	watcher    *fsnotify.Watcher
 	done       chan bool
+	ticker     *time.Ticker
 }
 
 // Returns the current CertPool and the generation number
@@ -73,12 +74,15 @@ func NewCertPoolWatcher(caDir string, log logr.Logger) (*CertPoolWatcher, error)
 		logPath(p, "watching certificate", log)
 	}
 
+	ticker := time.NewTicker(10 * time.Minute)
+
 	cpw := &CertPoolWatcher{
 		generation: 1,
 		dir:        caDir,
 		pool:       pool,
 		log:        log,
 		watcher:    watcher,
+		ticker:     ticker,
 		done:       make(chan bool),
 	}
 	go func() {
@@ -90,7 +94,10 @@ func NewCertPoolWatcher(caDir string, log logr.Logger) (*CertPoolWatcher, error)
 			case err := <-watcher.Errors:
 				log.Error(err, "error watching certificate dir")
 				os.Exit(1)
+			case <-ticker.C:
+				cpw.update()
 			case <-cpw.done:
+				ticker.Stop()
 				err := watcher.Close()
 				if err != nil {
 					log.Error(err, "error closing watcher")

internal/shared/util/http/certutil.go

@@ -10,10 +10,13 @@ import (
 )
 
 func NewCertPool(caDir string, log logr.Logger) (*x509.CertPool, error) {
+	// Note that this already looks at SSL_CERT_DIR and SSL_CERT_FILE
+	// So, we don't explicitly load certs from those locations
 	caCertPool, err := x509.SystemCertPool()
 	if err != nil {
 		return nil, err
 	}
+
 	if caDir == "" {
 		return caCertPool, nil
 	}