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.

Sign up for GitHub

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

aws: Set provider ID when starting kubelet #16223

Merged
merged 1 commit into from
Jan 5, 2024
Merged

aws: Set provider ID when starting kubelet #16223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions nodeup/pkg/model/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,19 @@ func (b *KubeletBuilder) Build(c *fi.NodeupModelBuilderContext) error {
}

{
t, err := buildKubeletComponentConfig(kubeletConfig)
// Set the provider ID to help speed node registration on large clusters
var providerID string
if b.CloudProvider() == kops.CloudProviderAWS {
sess := session.Must(session.NewSession())
metadata := ec2metadata.New(sess)
instanceIdentity, err := metadata.GetInstanceIdentityDocument()
if err != nil {
return err
}
providerID = fmt.Sprintf("aws:///%s/%s", instanceIdentity.AvailabilityZone, instanceIdentity.InstanceID)
}

t, err := buildKubeletComponentConfig(kubeletConfig, providerID)
if err != nil {
return err
}
Expand Down Expand Up @@ -218,8 +230,11 @@ func (b *KubeletBuilder) Build(c *fi.NodeupModelBuilderContext) error {
return nil
}

func buildKubeletComponentConfig(kubeletConfig *kops.KubeletConfigSpec) (*nodetasks.File, error) {
func buildKubeletComponentConfig(kubeletConfig *kops.KubeletConfigSpec, providerID string) (*nodetasks.File, error) {
componentConfig := kubelet.KubeletConfiguration{}
if providerID != "" {
componentConfig.ProviderID = providerID
}
if kubeletConfig.ShutdownGracePeriod != nil {
componentConfig.ShutdownGracePeriod = *kubeletConfig.ShutdownGracePeriod
}
Expand Down
4 changes: 2 additions & 2 deletions nodeup/pkg/model/kubelet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func runKubeletBuilder(t *testing.T, context *fi.NodeupModelBuilderContext, node
return
}
{
fileTask, err := buildKubeletComponentConfig(kubeletConfig)
fileTask, err := buildKubeletComponentConfig(kubeletConfig, "")
if err != nil {
t.Fatalf("error from KubeletBuilder buildKubeletComponentConfig: %v", err)
return
Expand Down Expand Up @@ -406,7 +406,7 @@ func Test_BuildComponentConfigFile(t *testing.T) {
ShutdownGracePeriodCriticalPods: &metav1.Duration{Duration: 10 * time.Second},
}

_, err := buildKubeletComponentConfig(&componentConfig)
_, err := buildKubeletComponentConfig(&componentConfig, "")
if err != nil {
t.Errorf("Failed to build component config file: %v", err)
}
Expand Down
Loading