upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-08 16:30:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #101170 from jeremyje/fixscopes

Browse source 
GCE Windows: Use authenticated HTTP GET against GCS if VM has cloud-p…
This commit is contained in:
Kubernetes Prow Robot 2021-04-15 17:44:21 -07:00 committed by GitHub
commit 2342ac3cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cluster/gce/windows/common.psm1
View file

@ -248,7 +248,7 @@ function Get-RemoteFile {
$httpResponseMessage.Wait()
if (-not $httpResponseMessage.IsCanceled) {
# Check if the request was successful.
#
#
# DO NOT replace with EnsureSuccessStatusCode(), it prints the
# OAuth2 bearer token.
if (-not $httpResponseMessage.Result.IsSuccessStatusCode) {
@ -295,7 +295,7 @@ function Check-StorageScope {
While($true) {
$data = Get-InstanceMetadata -Key "service-accounts/default/scopes"
if ($data) {
return ($data -match "auth/devstorage")
return ($data -match "auth/devstorage") -or ($data -match "auth/cloud-platform")
}
Start-Sleep -Seconds 1
}