Skip to content
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

Improve client initialization error logging #4136

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Improve client initialization error logging #4136

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
15 changes: 10 additions & 5 deletions pkg/util/clusterdata/clusterdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (p ParallelEnricher) waitForResults(log *logrus.Entry, errChannel chan erro
timeout = true
}
default:
p.taskError(log, err, 1)
p.taskError(log.WithError(err), fmt.Errorf("failed to get enrichment results"), 1)
}
}
}
Expand All @@ -164,27 +164,32 @@ func (p ParallelEnricher) waitForResults(log *logrus.Entry, errChannel chan erro
// that we should skip because the clients they are using failed to instantiate
func (p ParallelEnricher) initializeClients(ctx context.Context, log *logrus.Entry, oc *api.OpenShiftCluster) (
k8s kubernetes.Interface, machineclient machineclient.Interface, operatorclient operatorclient.Interface, configclient configclient.Interface, unsuccessfulEnrichers map[string]bool) {
log = log.WithField("oc", oc)
log.Infoln("initializing clients")
unsuccessfulEnrichers = make(map[string]bool)
k8s, err := p.setupK8sClient(ctx, oc)
if err != nil {
unsuccessfulEnrichers[servicePrincipal] = true
unsuccessfulEnrichers[ingressProfile] = true
p.taskError(log, err, 2)
p.taskError(log.WithError(err), fmt.Errorf("failed to initialize k8s client"), 2)
}
machineclient, err = p.setupMachineClient(ctx, oc)
if err != nil {
unsuccessfulEnrichers[machineClient] = true
p.taskError(log, err, 1)
p.taskError(log.WithError(err), fmt.Errorf("failed to initialize machine client"), 2)
}
operatorclient, err = p.setupOperatorClient(ctx, oc)
if err != nil {
unsuccessfulEnrichers[ingressProfile] = true
p.taskError(log, err, 1)
p.taskError(log.WithError(err), fmt.Errorf("failed to initialize operator client"), 2)
}
configclient, err = p.setupConfigClient(ctx, oc)
if err != nil {
unsuccessfulEnrichers[clusterVersion] = true
p.taskError(log, err, 1)
p.taskError(log.WithError(err), fmt.Errorf("failed to initialize config client"), 2)
}
if len(unsuccessfulEnrichers) > 0 {
log.WithField("enrichers", unsuccessfulEnrichers).Error("one or more enrichers were unsuccessful")
}
return k8s, machineclient, operatorclient, configclient, unsuccessfulEnrichers
}
Expand Down
Loading