Skip to content

fix: don't panic when dumping nodes if we didn't capture cloud resources #18072

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
k8s-ci-robot merged 1 commit into from
Mar 14, 2026
Merged

fix: don't panic when dumping nodes if we didn't capture cloud resources #18072

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: 11 additions & 4 deletions pkg/dump/dumper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,20 @@ func NewLogDumper(bastionAddress string, sshConfig *ssh.ClientConfig, keyRing ag
// if the IPs are not found from kubectl get nodes, then these will be dumped also.
// This allows for dumping log on nodes even if they don't register as a kubernetes
// node, or if a node fails to register, or if the whole cluster fails to start.
func (d *logDumper) DumpAllNodes(ctx context.Context, nodes corev1.NodeList, maxNodesToDump int, cloudResources *resources.Dump) error {
func (d *logDumper) DumpAllNodes(ctx context.Context, nodes corev1.NodeList, maxNodesToDump int, cloudDump *resources.Dump) error {
var special, regular []*corev1.Node
var missingK8sNodes []*resources.Instance
var dumped []string

foundInstanceNames := make(map[string]struct{})
for _, cloudNode := range cloudResources.Instances {

var cloudInstances []*resources.Instance

if cloudDump != nil {
cloudInstances = cloudDump.Instances
}

for _, cloudNode := range cloudInstances {
for _, k8sNode := range nodes.Items {
if k8sNode.Name == cloudNode.Name {
foundInstanceNames[cloudNode.Name] = struct{}{}
Expand All @@ -131,14 +138,14 @@ func (d *logDumper) DumpAllNodes(ctx context.Context, nodes corev1.NodeList, max
}
}

for _, cloudNode := range cloudResources.Instances {
for _, cloudNode := range cloudInstances {
if _, found := foundInstanceNames[cloudNode.Name]; !found {
missingK8sNodes = append(missingK8sNodes, cloudNode)
}
}

if len(missingK8sNodes) > 0 {
klog.V(2).Infof("number of nodes from kubernetes (%d) differs from number of instances from cloud resources (%d)", len(nodes.Items), len(cloudResources.Instances))
klog.V(2).Infof("number of nodes from kubernetes (%d) differs from number of instances from cloud resources (%d)", len(nodes.Items), len(cloudInstances))
}

// Dumping priority
Expand Down
Loading