Skip to content

fix: disable UseInstanceMetadata in controller #2400

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

Merged
merged 1 commit into from
Mar 1, 2025
Merged

fix: disable UseInstanceMetadata in controller #2400

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
26 changes: 12 additions & 14 deletions pkg/azurefile/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,10 @@ func getCloudProvider(ctx context.Context, kubeconfig, nodeID, secretName, secre
config *azureconfig.Config
kubeClient kubernetes.Interface
fromSecret bool
err error
)

az := &azure.Cloud{}
repo := &storage.AccountRepo{}
var err error

// for sanity test: if kubeconfig is set as "no-need-kubeconfig", kubeClient will be nil
if kubeconfig == "no-need-kubeconfig" {
Expand Down Expand Up @@ -163,30 +162,29 @@ func getCloudProvider(ctx context.Context, kubeconfig, nodeID, secretName, secre
err = filewatcher.WatchFileForChanges(config.AADClientCertPath)
klog.Warningf("Failed to watch certificate file for changes: %v", err)
}
az := &azure.Cloud{}
if err = az.InitializeCloudFromConfig(ctx, config, fromSecret, false); err != nil {
klog.Warningf("InitializeCloudFromConfig failed with error: %v", err)
}
_, env, err := azclient.GetAzureCloudConfigAndEnvConfig(&config.ARMClientConfig)
if err != nil {
return nil, nil, fmt.Errorf("failed to get AzureCloudConfigAndEnvConfig: %v", err)
}
repo, err = storage.NewRepository(*config, env, az.ComputeClientFactory, az.NetworkClientFactory)
if err != nil {
return nil, nil, fmt.Errorf("failed to create storage repository: %v", err)
}
}

isController := (nodeID == "")
if isController {
if err == nil {
if nodeID == "" {
// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
klog.V(2).Infof("disable UseInstanceMetadata for controller server")
az.Config.UseInstanceMetadata = false
config.UseInstanceMetadata = false
klog.V(2).Infof("starting controller server...")
} else {
klog.V(2).Infof("starting node server on node(%s)", nodeID)
}

repo, err = storage.NewRepository(*config, env, az.ComputeClientFactory, az.NetworkClientFactory)
if err != nil {
return nil, nil, fmt.Errorf("failed to create storage repository: %v", err)
}
klog.V(2).Infof("starting controller server...")
} else {
klog.V(2).Infof("starting node server on node(%s)", nodeID)
}

return repo, kubeClient, nil
Expand Down
Loading