Make it possible to set node naming convention #1006
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
|
✔️ Deploy Preview for karpenter-docs-prod canceled. 🔨 Explore the source changes: c1df256 🔍 Inspect the deploy log: https://app.netlify.com/sites/karpenter-docs-prod/deploys/61bb80f02d847e00083d2a20 |
ellistarn
reviewed
Dec 16, 2021
ellistarn
reviewed
Dec 16, 2021
pkg/cloudprovider/aws/instance.go
Outdated
| if injection.GetOptions(ctx).AWSNodeNameConvention == "ip-name" { | ||
| nodeName = aws.StringValue(instance.PrivateDnsName) | ||
| } else { | ||
| nodeName = *instance.InstanceId |
There was a problem hiding this comment.
nit: aws.StringValue() helps us avoid NPEs.
ellistarn
reviewed
Dec 16, 2021
pkg/cloudprovider/aws/instance.go
Outdated
| for _, instanceType := range instanceTypes { | ||
| if instanceType.Name() == aws.StringValue(instance.InstanceType) { | ||
| var nodeName string |
There was a problem hiding this comment.
Consider collapsing to
nodeName := ...
if ... {
nodeName = ...
}
ellistarn
reviewed
Dec 16, 2021
| } | ||
|
|
||
| func (o Options) Validate() (err error) { | ||
| err = multierr.Append(err, o.validateEndpoint()) | ||
| if o.ClusterName == "" { | ||
| err = multierr.Append(err, fmt.Errorf("CLUSTER_NAME is required")) | ||
| } | ||
| if o.AWSNodeNameConvention != "ip-name" && o.AWSNodeNameConvention != "resource-name" { |
There was a problem hiding this comment.
Can we default to ip-name, for now? I'd hate for folks to have to pass this flag in all cases.
edit: nvm, you did this in the flag above. 👍
There was a problem hiding this comment.
ip-name is the default when parsing the flags. There shouldn't be a need to set this explicitly when running through main(). At least that was my intention.
ellistarn
reviewed
Dec 16, 2021
ellistarn
reviewed
Dec 16, 2021
olemarkus
force-pushed
the
rbn
branch
2 times, most recently
from
5b934b5 to
f45a0aa
Compare
ellistarn
previously approved these changes
Dec 16, 2021
As of k8s 1.23, CCM supports both instance ID (resource name) and private dns (ip name) based naming. It is not possible for karpenter to determine when which convention is used, and this may also depend on the installer used. Therefore this is added as a CLI argument Update pkg/utils/options/options.go Co-authored-by: Ellis Tarn <[email protected]>
ellistarn
approved these changes
Dec 17, 2021
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.
As of k8s 1.23, CCM supports both instance ID (resource name) and private dns (ip name) based naming.
It is not possible for karpenter to determine when which convention is used, and this may also depend on the installer used.
Therefore this is added as a CLI argument.
1. Issue, if available:
Fixes #927
2. Description of changes:
This adds a CLI flag for the node naming convention.
This is AWS specifc, so I added an "AWS" prefix. I think this is the first "global" cloud provider setting, so I was not sure how you wanted to name this.
I think a CLI arg for this is the only way of fixing this issue. Trying to parse k8s version and whether or not the external CCM is used is a bit fragile. It is also not given that the external CCM is the "official" one.
3. Does this change impact docs?
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.