[release-1.21] Use FQDN for node name if cloud provider is set to AWS #1622
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
vadorovsky
approved these changes
Aug 12, 2021
briandowns
approved these changes
Aug 12, 2021
brandond
requested changes
Aug 12, 2021
pkg/rke2/rke2_linux.go
Outdated
Comment on lines
204
to
207
| fqdn := b.String() | ||
| fqdn = fqdn[:len(fqdn)-1] | ||
|
|
||
| return fqdn, nil |
There was a problem hiding this comment.
Suggested change
| fqdn := b.String() | |
| fqdn = fqdn[:len(fqdn)-1] | |
| return fqdn, nil | |
| return strings.TrimSpace(b.String()), nil |
There was a problem hiding this comment.
If we do this, then we don't need line 205.
brandond
requested changes
Aug 12, 2021
pkg/rke2/rke2_linux.go
Outdated
Comment on lines
69
to
70
| nodeName := clx.String("node-name") | ||
| if nodeName == "" && cfg.CloudProviderName == "aws" { |
There was a problem hiding this comment.
We only appear to use the nodeName in the test; don't bother creating a variable for it?
Suggested change
| nodeName := clx.String("node-name") | |
| if nodeName == "" && cfg.CloudProviderName == "aws" { | |
| if clx.String("node-name") == "" && cfg.CloudProviderName == "aws" { |
brandond
approved these changes
Aug 12, 2021
brandond
changed the title
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.
Proposed Changes
Use FQDN hostname for node name if
--node-nameis not set and--cloud-provider-nameis set to AWSYes we should mention that if the user didn't enter a specific node name and cloud provider is set to aws then node name will default to
hostname -fTypes of Changes
Bug Fix
Verification
Linked Issues
#1618
Further Comments