Skip to content

Improve runDiagnostics debug output when no resource info available #210

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

Merged
stevekuznetsov merged 1 commit into from
Mar 2, 2026
Merged

Improve runDiagnostics debug output when no resource info available #210

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
29 changes: 22 additions & 7 deletions tools/helm/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func (opts *Options) Deploy(ctx context.Context) error {
}

// Start a deployment timer to use for finding relevant logs in runDiagnostics
deploymentStartTime := time.Now()
deploymentStart := time.Now()

logger.Info("Rolling out Helm release.", "dryRun", opts.DryRun)
releaser, releaseErr := runHelmUpgrade(ctx, logger, opts)
Expand All @@ -328,7 +328,7 @@ func (opts *Options) Deploy(ctx context.Context) error {
logger.Info("Finished validating Helm release contents.")
} else {
logger.Info("Running inline diagnostics.")
if err := runDiagnostics(ctx, logger, opts, deploymentStartTime); err != nil {
if err := runDiagnostics(ctx, logger, opts, deploymentStart); err != nil {
logger.Error(err, "Failed to capture diagnostics for Helm release")
}
}
Expand Down Expand Up @@ -439,7 +439,9 @@ func isReleaseUninstalled(logger logr.Logger, versionsi []helmrelease.Releaser)
return len(versions) > 0 && versions[len(versions)-1].Info.Status == helmreleasecommon.StatusUninstalled
}

func runDiagnostics(ctx context.Context, logger logr.Logger, opts *Options, deploymentStartTime time.Time) error {
func runDiagnostics(ctx context.Context, logger logr.Logger, opts *Options, deploymentStart time.Time) error {
deploymentEnd := time.Now()

statusClient := action.NewStatus(opts.ActionConfig)
releaser, err := statusClient.Run(opts.ReleaseName)
if err != nil {
Expand All @@ -459,7 +461,23 @@ func runDiagnostics(ctx context.Context, logger logr.Logger, opts *Options, depl
"values", release.Config,
)

if release.Info == nil || len(release.Info.Resources) == 0 {
resourceCount := 0
if release.Info != nil {
resourceCount = len(release.Info.Resources)
}
if release.Info == nil || resourceCount == 0 {
logger.Info("No resource info available in release, skipping resource diagnostics.",
"infoNil", release.Info == nil,
"resourceCount", resourceCount,
)
if release.Namespace != "" {
nsLink, err := getNamespaceQuery(opts, release.Namespace, deploymentStart, deploymentEnd)
if err != nil {
logger.Error(err, "Failed to create Kusto deep link for namespace")
} else if nsLink != "" {
logger.Info("Kusto deep link for namespace-level troubleshooting", "kustoLinkNamespace", nsLink)
}
}
return nil
}

Expand All @@ -481,9 +499,6 @@ func runDiagnostics(ctx context.Context, logger logr.Logger, opts *Options, depl
}
}

deploymentStart := deploymentStartTime
deploymentEnd := time.Now()

if len(resources) > 0 {
logger.V(4).Info("Found resources in release:", "resources", resources)
resourcesQuery, err := getKubeEventsQuery(opts, resources, deploymentStart, deploymentEnd)
Expand Down
Loading