Skip to content

Remove early exit in credential-dependent controllers when credentials are missing (#2530) #2549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fanny-jiang wants to merge 1 commit into
base: v1.23
Choose a base branch
from
+0 −225
Open

Remove early exit in credential-dependent controllers when credentials are missing (#2530) #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,6 @@ func run(opts *options) error {
// Client is needed when Creds should be resolved from DDA so cached client is fine
credsManager := config.NewCredentialManagerWithDecryptor(mgr.GetClient(), secrets.NewSecretBackend())
creds, err := credsManager.GetCredentials()
if err != nil && opts.datadogMonitorEnabled {
return setupErrorf(setupLog, err, "Unable to get credentials for DatadogMonitor")
}

// Checks if credentials are mandatory due to a resource controller being enabled
if checkErr := checkRequiredCredentials(opts, err); checkErr != nil {
return checkErr
}

if opts.secretRefreshInterval > 0 && opts.secretBackendCommand == "" {
setupLog.Error(nil, "secretRefreshInterval is set but secretBackendCommand is not configured")
Expand Down Expand Up @@ -510,24 +502,6 @@ func setupErrorf(logger logr.Logger, err error, msg string, keysAndValues ...any
return fmt.Errorf("%s, err:%w", msg, err)
}

// checkRequiredCredentials checks if credentials are required by any enabled controllers
// and returns an error if they are required but the provided error indicates they
// could not be obtained.
func checkRequiredCredentials(opts *options, credErr error) error {
// Check if credentials are required by any enabled controllers
requireCreds := opts.datadogMonitorEnabled || opts.datadogDashboardEnabled || opts.datadogSLOEnabled || opts.datadogGenericResourceEnabled

if requireCreds && credErr != nil {
return setupErrorf(setupLog, credErr, "Unable to retrieve Datadog API credentials required by one or more enabled controllers",
"DatadogMonitor", opts.datadogMonitorEnabled,
"DatadogDashboard", opts.datadogDashboardEnabled,
"DatadogSLO", opts.datadogSLOEnabled,
"DatadogGenericResource", opts.datadogGenericResourceEnabled)
}

return nil
}

func setupAndStartOperatorMetadataForwarder(logger logr.Logger, client client.Reader, kubernetesVersion string, options *options, credsManager *config.CredentialManager) {
omf := metadata.NewOperatorMetadataForwarder(logger, client, kubernetesVersion, version.GetVersion(), credsManager)
omf.OperatorMetadata = metadata.OperatorMetadata{
Expand Down
199 changes: 0 additions & 199 deletions cmd/main_test.go
View file
Open in desktop

This file was deleted.

Loading