github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

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