From 5733569bcea68d30446b877231882defc430eca4 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 15 Sep 2021 14:20:09 -0500 Subject: [PATCH] fail gracefully when client-ca file is not set or doesn't exist --- staging/operator-lifecycle-manager/pkg/lib/server/server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/staging/operator-lifecycle-manager/pkg/lib/server/server.go b/staging/operator-lifecycle-manager/pkg/lib/server/server.go index c7307fc7b4..79dd2bb588 100644 --- a/staging/operator-lifecycle-manager/pkg/lib/server/server.go +++ b/staging/operator-lifecycle-manager/pkg/lib/server/server.go @@ -32,7 +32,7 @@ func GetListenAndServeFunc(logger *logrus.Logger, tlsCertPath, tlsKeyPath, clien certStore, err := filemonitor.NewCertStore(*tlsCertPath, *tlsKeyPath) if err != nil { - return nil, fmt.Errorf("Certificate monitoring for metrics (https) failed: %v", err) + return nil, fmt.Errorf("certificate monitoring for metrics (https) failed: %v", err) } csw, err := filemonitor.NewWatch(logger, []string{filepath.Dir(*tlsCertPath), filepath.Dir(*tlsKeyPath)}, certStore.HandleFilesystemUpdate) @@ -41,6 +41,9 @@ func GetListenAndServeFunc(logger *logrus.Logger, tlsCertPath, tlsKeyPath, clien } csw.Run(context.Background()) certPoolStore, err := filemonitor.NewCertPoolStore(*clientCAPath) + if err != nil { + return nil, fmt.Errorf("certificate monitoring for client-ca failed: %v", err) + } cpsw, err := filemonitor.NewWatch(logger, []string{filepath.Dir(*clientCAPath)}, certPoolStore.HandleCABundleUpdate) if err != nil { return nil, fmt.Errorf("error creating cert file watcher: %v", err)