Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,16 @@ func run(opts *options) error {
return setupErrorf(setupLog, err, "Unable to setup Helm metadata forwarder")
}

// Start ticker-based metadata forwarders after leader election
// Register CRD metadata forwarder as a manager Runnable
if err = setupAndStartCRDMetadataForwarder(metadataLog, mgr, versionInfo.String(), opts, options.CredsManager); err != nil {
return setupErrorf(setupLog, err, "Unable to setup CRD metadata forwarder")
}

// Operator metadata forwarder still uses a poll loop; start after leader election.
go func() {
<-mgr.Elected()
setupLog.Info("Starting metadata forwarders")
setupLog.Info("Starting operator metadata forwarder")
setupAndStartOperatorMetadataForwarder(metadataLog, mgr.GetClient(), versionInfo.String(), opts, options.CredsManager)
setupAndStartCRDMetadataForwarder(metadataLog, mgr.GetClient(), versionInfo.String(), opts, options.CredsManager)
}()

// +kubebuilder:scaffold:builder
Expand Down Expand Up @@ -627,10 +631,10 @@ func setupAndStartOperatorMetadataForwarder(logger logr.Logger, client client.Re
omf.Start()
}

func setupAndStartCRDMetadataForwarder(logger logr.Logger, client client.Reader, kubernetesVersion string, options *options, credsManager *config.CredentialManager) {
func setupAndStartCRDMetadataForwarder(logger logr.Logger, mgr manager.Manager, kubernetesVersion string, options *options, credsManager *config.CredentialManager) error {
cmf := metadata.NewCRDMetadataForwarder(
logger,
client,
mgr,
kubernetesVersion,
version.GetVersion(),
credsManager,
Expand All @@ -641,7 +645,7 @@ func setupAndStartCRDMetadataForwarder(logger logr.Logger, client client.Reader,
DatadogAgentProfileEnabled: options.datadogAgentProfileEnabled,
},
)
cmf.Start()
return mgr.Add(cmf)
}

func setupAndStartHelmMetadataForwarder(logger logr.Logger, mgr manager.Manager, client client.Reader, kubernetesVersion string, credsManager *config.CredentialManager) error {
Expand Down
Loading
Loading