refactor: 💡 don't lookup oldest unless neeeded #614
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
| @@ -51,7 +51,9 @@ type AwsCredentials struct { | |||
|
|
|||
| // NewCluster creates a new Cluster object and populates its | |||
| // fields with the values from the Kubernetes cluster in the client passed to it. | |||
| func NewCluster(c *client.KubeClient) (*Cluster, error) { | |||
| func NewCluster(c *client.KubeClient, recycleOldest bool) (*Cluster, error) { | |||
There was a problem hiding this comment.
NewCluster function isn't used by any other components other than recycle-node so it's safe to refactor like this
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #614 +/- ##
==========================================
+ Coverage 37.11% 37.25% +0.13%
==========================================
Files 50 50
Lines 3225 3213 -12
==========================================
Hits 1197 1197
+ Misses 1903 1891 -12
Partials 125 125 ☔ View full report in Codecov by Sentry. |
| @@ -90,16 +90,6 @@ func GetAllNodes(c *client.KubeClient) ([]v1.Node, error) { | |||
| return n, nil | |||
| } | |||
|
|
|||
| func getOldestNode(c *client.KubeClient) (v1.Node, error) { | |||
There was a problem hiding this comment.
|
|
||
| // RefreshStatus performs a value overwrite of the cluster status. | ||
| // This is useful for when the cluster is being updated. | ||
| func (c *Cluster) RefreshStatus(client *client.KubeClient) (err error) { |
There was a problem hiding this comment.
mikebell
approved these changes
Aug 29, 2024
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.
I am still hitting the error which is caused when the oldest node is a monitoring node, we only care about that when we are recycling nodes and are specifying we want to recycle the oldest node.
We want to be prevented from recycling the oldest node when it's a monitoring node because we only care about recycling nodes with user workloads on.
When we specify which node to recycle it doesn't matter that the oldest one is a monitoring node because we have explicitly specified which node we will recycle, so we can safely bypass checking and throwing the error when we have named the instance to recycle.
Also, remove aa couple of unused function 1, unused function 2
These changes allow me to use the
cloud-platform cluster recycle-node --name foobar-nodecommand in the cordon and drain pipeline and avoid irrelevant errors