Fix EKS Discover User Task reporting #50989
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `clusterNames` slice and `clusterByNames` key set must be the same. When there was two groups of EKS Clusters, one with App Discovery enabled and another one with it disabled, we had different set of clusters being processed. `clusterNames` had all the EKS Clusters, while `clusterByNames` only had the EKS Clusters for one of the processing groups (either AppDiscovery=on or AppDiscovery=off). This meant that when the `EnrollEKSClusters` returned an error, we looked up the map, but it might be the case that that particular EKS Cluster was not configured for the current processing group. So, the `clusterByNames[r.EksClusterName]` returned a nil value, which resulted in a panic.
r0mant
reviewed
Jan 13, 2025
There was a problem hiding this comment.
I don't know if this is a robust fix, relying on clustersByName containing the same keys as clusterNames seems pretty fragile and still leaves room for a mistake later for a non-existent key on the line that @tigrato pointed out:
Can we make the map indexing there safer too as a part of this fix?
I'll add a check there 👍 |
tigrato
approved these changes
Jan 13, 2025
r0mant
approved these changes
Jan 13, 2025
public-teleport-github-review-bot
bot
removed request for
smallinsky and
capnspacehook
|
@marcoandredinis See the table below for backport results.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
clusterNamesslice andclusterByNameskey set must be the same.When there was two groups of EKS Clusters, one with App Discovery enabled and another one with it disabled, we had different set of clusters being processed.
clusterNameshad all the EKS Clusters, whileclusterByNamesonly had the EKS Clusters for one of the processing groups (either AppDiscovery=on or AppDiscovery=off).This meant that when the
EnrollEKSClustersreturned an error, we looked up the map, but it might be the case that that particular EKS Cluster was not configured for the current processing group. So, theclusterByNames[r.EksClusterName]returned a nil value, which resulted in a panic.changelog: Fix a panic that occurred when EKS Auto Discovery was configured at least two times for an Integration, where one of them had App Auto Discovery enabled and the other one didn't.