upgrade azure sdk to support ultra ssd

update Godeps.json

update azure sdk for ultrassd support

update bazel

fix build failure

Kubernetes-commit: d210b4bcf350308f51d8bffb7748b2cc3fb611c0
This commit is contained in:
andyzhangx 2018-10-29 08:03:22 +00:00 committed by Kubernetes Publisher
parent ddab801f99
commit af076e5342

View File

@ -17,6 +17,7 @@ limitations under the License.
package azure package azure
import ( import (
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"net/http" "net/http"
@ -243,9 +244,9 @@ func (ts *azureTokenSource) retrieveTokenFromCfg() (*azureToken, error) {
token: adal.Token{ token: adal.Token{
AccessToken: accessToken, AccessToken: accessToken,
RefreshToken: refreshToken, RefreshToken: refreshToken,
ExpiresIn: expiresIn, ExpiresIn: json.Number(expiresIn),
ExpiresOn: expiresOn, ExpiresOn: json.Number(expiresOn),
NotBefore: expiresOn, NotBefore: json.Number(expiresOn),
Resource: fmt.Sprintf("spn:%s", apiserverID), Resource: fmt.Sprintf("spn:%s", apiserverID),
Type: tokenType, Type: tokenType,
}, },
@ -262,8 +263,8 @@ func (ts *azureTokenSource) storeTokenInCfg(token *azureToken) error {
newCfg[cfgClientID] = token.clientID newCfg[cfgClientID] = token.clientID
newCfg[cfgTenantID] = token.tenantID newCfg[cfgTenantID] = token.tenantID
newCfg[cfgApiserverID] = token.apiserverID newCfg[cfgApiserverID] = token.apiserverID
newCfg[cfgExpiresIn] = token.token.ExpiresIn newCfg[cfgExpiresIn] = string(token.token.ExpiresIn)
newCfg[cfgExpiresOn] = token.token.ExpiresOn newCfg[cfgExpiresOn] = string(token.token.ExpiresOn)
err := ts.persister.Persist(newCfg) err := ts.persister.Persist(newCfg)
if err != nil { if err != nil {