github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

update getmetadata to use unsafe read

Browse Source
This commit is contained in:
Anish Ramasekar 2019-10-22 13:55:13 -07:00
parent cebdd85186
commit eeeb59e71a
No known key found for this signature in database
GPG Key ID: 9E68541CF00F1FA4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/legacy-cloud-providers/azure/azure_instance_metadata.go
View File

@ -144,8 +144,9 @@ func (ims *InstanceMetadataService) getInstanceMetadata(key string) (interface{}
}
// GetMetadata gets instance metadata from cache.
func (ims *InstanceMetadataService) GetMetadata() (*InstanceMetadata, error) {
cache, err := ims.imsCache.Get(metadataCacheKey, cachedData)
// crt determines if we can get data from stalled cache/need fresh if cache expired.
func (ims *InstanceMetadataService) GetMetadata(crt cacheReadType) (*InstanceMetadata, error) {
cache, err := ims.imsCache.Get(metadataCacheKey, crt)
if err != nil {
return nil, err
}

6
staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go
View File

@ -73,7 +73,7 @@ func (az *Cloud) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.N
}
if az.UseInstanceMetadata {
metadata, err := az.metadata.GetMetadata()
metadata, err := az.metadata.GetMetadata(allowUnsafeRead)
if err != nil {
return nil, err
}
@ -259,7 +259,7 @@ func (az *Cloud) InstanceID(ctx context.Context, name types.NodeName) (string, e
}
if az.UseInstanceMetadata {
metadata, err := az.metadata.GetMetadata()
metadata, err := az.metadata.GetMetadata(allowUnsafeRead)
if err != nil {
return "", err
}
@ -346,7 +346,7 @@ func (az *Cloud) InstanceType(ctx context.Context, name types.NodeName) (string,
}
if az.UseInstanceMetadata {
metadata, err := az.metadata.GetMetadata()
metadata, err := az.metadata.GetMetadata(allowUnsafeRead)
if err != nil {
return "", err
}

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_zones.go
View File

@ -53,7 +53,7 @@ func (az *Cloud) GetZoneID(zoneLabel string) string {
// 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()
metadata, err := az.metadata.GetMetadata(allowUnsafeRead)
if err != nil {
return cloudprovider.Zone{}, err
}