Skip to content
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.

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

Fix startup with missing etcd static pod manifest #520

Merged
merged 1 commit into from Nov 10, 2020

Conversation

brandond
Copy link
Contributor

@brandond brandond commented Nov 6, 2020

Proposed Changes

Properly start up if the etcd static pod manifest has been deleted. This is created on first startup, but on subsequent startups where we attempt to read InitialOptions from the manifest, rke2 would fail because the 'no such file or directory' error was not properly suppressed.

Types of Changes

  • bugfix

Verification

See steps from linked issue

Linked Issues

Related to #373

Further Comments

Seems like the intent was to ignore the file not found error, but
apparently someone forgot that a bare return would use the err
value returned by ReadFile, not the default nil from the named return.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner November 6, 2020 23:51
Copy link
Contributor

@galal-hussein galal-hussein left a comment

Choose a reason for hiding this comment

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

LGTM

@davidnuzik davidnuzik merged commit fff78d8 into rancher:master Nov 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants