Skip to content

[0.14] Fix nil dereference for cluster import token #4510

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
thardeck merged 1 commit into from
Jan 9, 2026
Merged

[0.14] Fix nil dereference for cluster import token #4510

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
22 changes: 17 additions & 5 deletions internal/cmd/controller/agentmanagement/controllers/cluster/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
tokenName := names.SafeConcatName(ImportTokenPrefix + cluster.Name)
token, err := i.tokens.Get(cluster.Namespace, tokenName)
if err != nil {
// ignore error
_, err = i.tokenClient.Create(&fleet.ClusterRegistrationToken{
// If token doesn't exist, try to create it
token, err = i.tokenClient.Create(&fleet.ClusterRegistrationToken{
ObjectMeta: metav1.ObjectMeta{
Namespace: cluster.Namespace,
Name: tokenName,
Expand All @@ -374,9 +374,21 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
TTL: &metav1.Duration{Duration: durations.ClusterImportTokenTTL},
},
})
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, nil
// Handle AlreadyExists errors (race condition with another reconcile)
if err != nil {
if apierrors.IsAlreadyExists(err) {
token, err = i.tokens.Get(cluster.Namespace, tokenName)
if err != nil {
logrus.Debugf("Failed to get existing ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}
} else {
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}
}
Comment on lines +378 to +391
Copy link
Contributor

@aruiz14 aruiz14 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick about style (I don't like too many nested if-else):

Suggested change
if err != nil {
if apierrors.IsAlreadyExists(err) {
token, err = i.tokens.Get(cluster.Namespace, tokenName)
if err != nil {
logrus.Debugf("Failed to get existing ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}
} else {
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}
}
if apierrors.IsAlreadyExists(err) {
token, err = i.tokens.Get(cluster.Namespace, tokenName)
if err != nil {
logrus.Debugf("Failed to get existing ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}
} else if err != nil {
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, err
}

Copy link
Contributor

@aruiz14 aruiz14 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that this is a backport and not the original PR, nevermind then 😅

Copy link
Contributor Author

@weyfonk weyfonk Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree that the style is a bit less than ideal, but this is indeed a backport :)

}

agentNamespace := i.systemNamespace
Expand Down
Loading