Merge pull request #18155 from hakman/azure-provider-id

azure: Set provider ID when starting kubelet

Author: k8s-ci-robot

nodeup/pkg/model/kubelet.go

@@ -42,6 +42,7 @@ import (
 	"k8s.io/kops/pkg/systemd"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
+	azurecloud "k8s.io/kops/upup/pkg/fi/cloudup/azure"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
 	"k8s.io/kops/util/pkg/distributions"
 	kubeletv1 "k8s.io/kubelet/config/v1"
@@ -93,6 +94,12 @@ func (b *KubeletBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 				return err
 			}
 			providerID = fmt.Sprintf("aws:///%s/%s", instanceIdentity.AvailabilityZone, instanceIdentity.InstanceID)
+		} else if b.CloudProvider() == kops.CloudProviderAzure {
+			metadata, err := azurecloud.QueryComputeInstanceMetadata()
+			if err != nil {
+				return fmt.Errorf("error querying Azure instance metadata: %v", err)
+			}
+			providerID = "azure://" + metadata.ResourceID
 		}
 
 		t, err := buildKubeletComponentConfig(kubeletConfig, providerID)

pkg/nodeidentity/azure/client.go

@@ -18,15 +18,13 @@ package azure
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	compute "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
+	azurecloud "k8s.io/kops/upup/pkg/fi/cloudup/azure"
 )
 
 // client is an Azure client.
@@ -38,7 +36,7 @@ type client struct {
 
 // newClient returns a new Client.
 func newClient() (*client, error) {
-	metadata, err := queryComputeInstanceMetadata()
+	metadata, err := azurecloud.QueryComputeInstanceMetadata()
 	if err != nil {
 		return nil, fmt.Errorf("error querying instance metadata: %s", err)
 	}
@@ -94,40 +92,3 @@ func (c *client) getVMTags(ctx context.Context, providerID string) (map[string]*
 		return nil, fmt.Errorf("unsupported resource type %q for %q", res.ResourceType, providerID)
 	}
 }
-
-type instanceMetadata struct {
-	SubscriptionID    string `json:"subscriptionId"`
-	ResourceGroupName string `json:"resourceGroupName"`
-}
-
-// queryComputeInstanceMetadata queries Azure Instance Metadata.
-// https://docs.microsoft.com/en-us/azure/virtual-machines/windows/instance-metadata-service
-func queryComputeInstanceMetadata() (*instanceMetadata, error) {
-	client := &http.Client{}
-	req, err := http.NewRequest("GET", "http://169.254.169.254/metadata/instance/compute", nil)
-	if err != nil {
-		return nil, fmt.Errorf("error creating a new request: %s", err)
-	}
-	req.Header.Add("Metadata", "True")
-
-	q := req.URL.Query()
-	q.Add("api-version", "2025-04-07")
-	q.Add("format", "json")
-	req.URL.RawQuery = q.Encode()
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("error sending request to the metadata server: %s", err)
-	}
-
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("error reading a response from the metadata server: %s", err)
-	}
-	metadata := &instanceMetadata{}
-	if err := json.Unmarshal(body, metadata); err != nil {
-		return nil, fmt.Errorf("error unmarshalling metadata: %s", err)
-	}
-	return metadata, nil
-}

upup/pkg/fi/cloudup/azure/authenticator.go

@@ -37,7 +37,7 @@ func NewAzureAuthenticator() (bootstrap.Authenticator, error) {
 }
 
 func (h *azureAuthenticator) CreateToken(body []byte) (string, error) {
-	metadata, err := queryComputeInstanceMetadata()
+	metadata, err := QueryComputeInstanceMetadata()
 	if err != nil {
 		return "", fmt.Errorf("querying instance metadata: %w", err)
 	}
@@ -50,16 +50,17 @@ func (h *azureAuthenticator) CreateToken(body []byte) (string, error) {
 	return AzureAuthenticationTokenPrefix + token, nil
 }
 
-type instanceMetadata struct {
+// InstanceMetadata contains compute instance metadata from the Azure IMDS.
+type InstanceMetadata struct {
 	SubscriptionID    string `json:"subscriptionId"`
 	ResourceGroupName string `json:"resourceGroupName"`
 	ResourceID        string `json:"resourceId"`
 	VMID              string `json:"vmId"`
 }
 
-// queryComputeInstanceMetadata queries Azure Instance Metadata Service (IMDS)
+// QueryComputeInstanceMetadata queries Azure Instance Metadata Service (IMDS)
 // https://learn.microsoft.com/en-us/azure/virtual-machines/instance-metadata-service
-func queryComputeInstanceMetadata() (*instanceMetadata, error) {
+func QueryComputeInstanceMetadata() (*InstanceMetadata, error) {
 	transport := &http.Transport{Proxy: nil}
 
 	client := http.Client{Transport: transport}
@@ -85,7 +86,7 @@ func queryComputeInstanceMetadata() (*instanceMetadata, error) {
 	if err != nil {
 		return nil, fmt.Errorf("reading a response from the metadata server: %w", err)
 	}
-	metadata := &instanceMetadata{}
+	metadata := &InstanceMetadata{}
 	err = json.Unmarshal(body, metadata)
 	if err != nil {
 		return nil, fmt.Errorf("unmarshalling instance metadata: %w", err)

upup/pkg/fi/cloudup/azure/verifier.go

@@ -193,7 +193,7 @@ type client struct {
 
 // newClient returns a new Client.
 func newClient() (*client, error) {
-	metadata, err := queryComputeInstanceMetadata()
+	metadata, err := QueryComputeInstanceMetadata()
 	if err != nil || metadata == nil {
 		return nil, fmt.Errorf("getting instance metadata: %w", err)
 	}