From 5f5eea4a24cf1afe3c0313f78124a88bf32cca67 Mon Sep 17 00:00:00 2001 From: Julien Balestra Date: Thu, 25 Jun 2020 12:06:30 +0200 Subject: [PATCH] azure: use the parsed value from the configuration Signed-off-by: Julien Balestra --- staging/src/k8s.io/legacy-cloud-providers/azure/azure.go | 2 +- staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go index 7c991d87453..39b6912bb9d 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure.go @@ -391,7 +391,7 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro // No credentials provided, useInstanceMetadata should be enabled for Kubelet. // TODO(feiskyer): print different error message for Kubelet and controller-manager, as they're // requiring different credential settings. - if !config.UseInstanceMetadata && az.Config.CloudConfigType == cloudConfigTypeFile { + if !config.UseInstanceMetadata && config.CloudConfigType == cloudConfigTypeFile { return fmt.Errorf("useInstanceMetadata must be enabled without Azure credentials") } diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go index b6ab5f5a5be..f263f2f61ee 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_test.go @@ -3324,8 +3324,8 @@ func TestInitializeCloudFromConfig(t *testing.T) { AzureAuthConfig: auth.AzureAuthConfig{ Cloud: "AZUREPUBLICCLOUD", }, + CloudConfigType: cloudConfigTypeFile, } - az.Config.CloudConfigType = cloudConfigTypeFile err = az.InitializeCloudFromConfig(&config, false) expectedErr = fmt.Errorf("useInstanceMetadata must be enabled without Azure credentials") assert.Equal(t, expectedErr, err)