Merge pull request #74936 from rjaini/rj_1.14

Adding a check to make sure Metadata is read only if flag value is true.
This commit is contained in:
Kubernetes Prow Robot
2019-03-07 01:07:13 -08:00
committed by GitHub
2 changed files with 33 additions and 23 deletions

View File

@@ -1677,6 +1677,7 @@ func TestGetZone(t *testing.T) {
cloud := &Cloud{
Config: Config{
Location: "eastus",
UseInstanceMetadata: true,
},
}
testcases := []struct {

View File

@@ -19,6 +19,7 @@ package azure
import (
"context"
"fmt"
"os"
"strconv"
"strings"
@@ -49,6 +50,7 @@ func (az *Cloud) GetZoneID(zoneLabel string) string {
// GetZone returns the Zone containing the current availability zone and locality region that the program is running in.
// If the node is not running with availability zones, then it will fall back to fault domain.
func (az *Cloud) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
if az.UseInstanceMetadata {
metadata, err := az.metadata.GetMetadata()
if err != nil {
return cloudprovider.Zone{}, err
@@ -74,6 +76,13 @@ func (az *Cloud) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
FailureDomain: zone,
Region: az.Location,
}, nil
}
// if UseInstanceMetadata is false, get Zone name by calling ARM
hostname, err := os.Hostname()
if err != nil {
return cloudprovider.Zone{}, fmt.Errorf("failure getting hostname from kernel")
}
return az.vmSet.GetZoneByNodeName(strings.ToLower(hostname))
}
// GetZoneByProviderID implements Zones.GetZoneByProviderID