Fix machine creation bootstrap tokens expiration #773
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
|
@schrodit Thank you for your contribution. |
gardener-robot
added
needs/review
|
Thank you @schrodit for your contribution. Before I can start building your PR, a member of the organization must set the required label(s) {'reviewed/ok-to-test'}. Once started, you can check the build status in the PR checks section below. |
himanshu-kun
suggested changes
Jan 31, 2023
Comment on lines
94
to
97
| expiration := c.safetyOptions.MachineCreationTimeout.Duration | ||
| if machine.Spec.MachineConfiguration != nil && machine.Spec.MachineConfiguration.MachineCreationTimeout != nil { | ||
| expiration = machine.Spec.MachineConfiguration.MachineCreationTimeout.Duration | ||
| } |
There was a problem hiding this comment.
we can use the helper function getEffectiveCreationTimeout for this.
There was a problem hiding this comment.
ah didn't know that helper function exists.
Updated the code PTAL.
himanshu-kun
added
the
needs/cherry-pick
schrodit
force-pushed
the
fix-bootstrap
branch
from
f59217c to
f8b3aee
Compare
gardener-robot
added
reviewed/lgtm
himanshu-kun
added
the
reviewed/ok-to-test
gardener-robot-ci-2
added
needs/ok-to-test
gardener-robot
added
the
status/closed
This was referenced Feb 1, 2023
himanshu-kun
removed
the
needs/cherry-pick
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.
What this PR does / why we need it:
The expiration of bootstrap tokens is hardcoded in the machine controller deployment. (depending on the provider but mostly approx. 20min).
There is an option to overwrite this default per worker group with
machineCreationTimeout.This option is considered during the machine creation but not in the bootstrap token.
So this means that if the machine takes more time than 20 minutes to be created, the bootstrap token is already expired and the needed configs cannot be fetched form the cluster.
This PR makes the bootstrap token respect the machines
machineCreationTimeoutoption.Which issue(s) this PR fixes:
Fixes #772
Special notes for your reviewer:
Tested with the equinix provider
Release note: