aws: Set provider ID when starting kubelet

kubernetes · Jan 5, 2024 · 7a59599 · 7a59599
1 parent 57b457c
commit 7a59599
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
@@ -72,7 +72,7 @@ func (b *KubeletBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 	}
 
 	{
-		t, err := buildKubeletComponentConfig(kubeletConfig)
+		t, err := b.buildKubeletComponentConfig(kubeletConfig)
 		if err != nil {
 			return err
 		}
@@ -218,8 +218,21 @@ func (b *KubeletBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 	return nil
 }
 
-func buildKubeletComponentConfig(kubeletConfig *kops.KubeletConfigSpec) (*nodetasks.File, error) {
+func (b *KubeletBuilder) buildKubeletComponentConfig(kubeletConfig *kops.KubeletConfigSpec) (*nodetasks.File, error) {
 	componentConfig := kubelet.KubeletConfiguration{}
+	if b.CloudProvider() == kops.CloudProviderAWS {
+		sess := session.Must(session.NewSession())
+		metadata := ec2metadata.New(sess)
+
+		if metadata.Available() {
+			instanceIdentity, err := metadata.GetInstanceIdentityDocument()
+			if err != nil {
+				return nil, err
+			}
+
+			componentConfig.ProviderID = fmt.Sprintf("aws:///%s/%s", instanceIdentity.AvailabilityZone, instanceIdentity.InstanceID)
+		}
+	}
 	if kubeletConfig.ShutdownGracePeriod != nil {
 		componentConfig.ShutdownGracePeriod = *kubeletConfig.ShutdownGracePeriod
 	}

diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go
@@ -195,7 +195,7 @@ func runKubeletBuilder(t *testing.T, context *fi.NodeupModelBuilderContext, node
 		return
 	}
 	{
-		fileTask, err := buildKubeletComponentConfig(kubeletConfig)
+		fileTask, err := builder.buildKubeletComponentConfig(kubeletConfig)
 		if err != nil {
 			t.Fatalf("error from KubeletBuilder buildKubeletComponentConfig: %v", err)
 			return
@@ -401,12 +401,20 @@ func RunGoldenTest(t *testing.T, basedir string, key string, builder func(*Nodeu
 }
 
 func Test_BuildComponentConfigFile(t *testing.T) {
+	builder := KubeletBuilder{
+		NodeupModelContext: &NodeupModelContext{
+			BootConfig: &nodeup.BootConfig{
+				CloudProvider: kops.CloudProviderAWS,
+			},
+		},
+	}
+
 	componentConfig := kops.KubeletConfigSpec{
 		ShutdownGracePeriod:             &metav1.Duration{Duration: 30 * time.Second},
 		ShutdownGracePeriodCriticalPods: &metav1.Duration{Duration: 10 * time.Second},
 	}
 
-	_, err := buildKubeletComponentConfig(&componentConfig)
+	_, err := builder.buildKubeletComponentConfig(&componentConfig)
 	if err != nil {
 		t.Errorf("Failed to build component config file: %v", err)
 	}