Start the disk manager watch files go-routine

Signed-off-by: Sorin Dumitru <sdumitru@bloomberg.net>
spiffe · May 21, 2024 · 23e20a7 · 23e20a7
1 parent 5d5c33a
commit 23e20a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/server/endpoints/config.go b/pkg/server/endpoints/config.go
@@ -98,7 +98,7 @@ type Config struct {
 	BundleManager *bundle_client.Manager
 }
 
-func (c *Config) maybeMakeBundleEndpointServer() Server {
+func (c *Config) maybeMakeBundleEndpointServer(ctx context.Context) Server {
 	if c.BundleEndpoint.Address == nil {
 		return nil
 	}
@@ -109,6 +109,8 @@ func (c *Config) maybeMakeBundleEndpointServer() Server {
 		serverAuth = bundle.ACMEAuth(c.Log.WithField(telemetry.SubsystemName, "bundle_acme"), c.Catalog.GetKeyManager(), *c.BundleEndpoint.ACME)
 	} else if c.BundleEndpoint.DiskCertManager != nil {
 		serverAuth = c.BundleEndpoint.DiskCertManager
+		// Start watching for file changes
+		go c.BundleEndpoint.DiskCertManager.WatchFileChanges(ctx)
 	} else {
 		serverAuth = bundle.SPIFFEAuth(func() ([]*x509.Certificate, crypto.PrivateKey, error) {
 			state := c.SVIDObserver.State()

diff --git a/pkg/server/endpoints/endpoints.go b/pkg/server/endpoints/endpoints.go
@@ -154,7 +154,7 @@ func New(ctx context.Context, c Config) (*Endpoints, error) {
 		DataStore:                    ds,
 		BundleCache:                  bundle.NewCache(ds, c.Clock),
 		APIServers:                   c.makeAPIServers(ef),
-		BundleEndpointServer:         c.maybeMakeBundleEndpointServer(),
+		BundleEndpointServer:         c.maybeMakeBundleEndpointServer(ctx),
 		Log:                          c.Log,
 		Metrics:                      c.Metrics,
 		RateLimit:                    c.RateLimit,