Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
3013d3e528 Update dependencies to v0.15.9-beta.0 tag 2020-01-16 23:47:13 +00:00
Kubernetes Publisher
73fd2ddc91 Merge pull request #86457 from weinong/automated-cherry-pick-of-#86412-upstream-release-1.15
Automated cherry pick of #86412: It fixes a bug where AAD token obtained by kubectl is

Kubernetes-commit: 19a1e169ff18178213ab6e5b2e9069c04d11748e
2019-12-24 23:51:39 -08:00
Weinong Wang
e213ccc306 It fixes a bug where AAD token obtained by kubectl is incompatible with on-behalf-of flow and oidc.
Kubernetes-commit: fcb2225e6772e3e6f1baa2d59dcbe930f49cad2d
2019-12-18 20:21:21 -08:00
4 changed files with 10 additions and 10 deletions

4
Godeps/Godeps.json generated
View File

@@ -188,11 +188,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2cd11237263f"
"Rev": "v0.15.9-beta.0"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "31ade1b30762"
"Rev": "v0.15.9-beta.0"
},
{
"ImportPath": "k8s.io/klog",

8
go.mod
View File

@@ -26,8 +26,8 @@ require (
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
google.golang.org/appengine v1.5.0 // indirect
k8s.io/api v0.0.0-20191114100237-2cd11237263f
k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
k8s.io/api v0.15.9-beta.0
k8s.io/apimachinery v0.15.9-beta.0
k8s.io/klog v0.3.1
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
sigs.k8s.io/yaml v1.1.0
@@ -37,6 +37,6 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20191114100237-2cd11237263f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
k8s.io/api => k8s.io/api v0.15.9-beta.0
k8s.io/apimachinery => k8s.io/apimachinery v0.15.9-beta.0
)

4
go.sum
View File

@@ -93,8 +93,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20191114100237-2cd11237263f/go.mod h1:ceHJE/vDjU8jKnRV6Vqn/+vyZmC6NvOluInN+RhQkIs=
k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
k8s.io/api v0.15.9-beta.0/go.mod h1:CLNo7jlrlzxZWjPf8smihS5Gj4A/EByLwrfXGubsD6U=
k8s.io/apimachinery v0.15.9-beta.0/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

View File

@@ -287,7 +287,7 @@ func (ts *azureTokenSource) refreshToken(token *azureToken) (*azureToken, error)
return nil, err
}
oauthConfig, err := adal.NewOAuthConfig(env.ActiveDirectoryEndpoint, token.tenantID)
oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(env.ActiveDirectoryEndpoint, token.tenantID, nil)
if err != nil {
return nil, fmt.Errorf("building the OAuth configuration for token refresh: %v", err)
}
@@ -344,7 +344,7 @@ func newAzureTokenSourceDeviceCode(environment azure.Environment, clientID strin
}
func (ts *azureTokenSourceDeviceCode) Token() (*azureToken, error) {
oauthConfig, err := adal.NewOAuthConfig(ts.environment.ActiveDirectoryEndpoint, ts.tenantID)
oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(ts.environment.ActiveDirectoryEndpoint, ts.tenantID, nil)
if err != nil {
return nil, fmt.Errorf("building the OAuth configuration for device code authentication: %v", err)
}