Compare commits

..

7 Commits

Author SHA1 Message Date
Kubernetes Publisher
bb4f0ebb47 Update dependencies to v0.15.10 tag 2020-02-11 23:13:26 +00:00
Kubernetes Publisher
c06521ac77 Merge pull request #87640 from cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.15
update gopkg.in/yaml.v2 to v2.2.8

Kubernetes-commit: f0df81892db55b76406c40dec4c4528e4b3cdc80
2020-01-31 23:27:29 +00:00
Kubernetes Publisher
c39fa9734c Merge pull request #87538 from weinong/automated-cherry-pick-of-#87507-upstream-release-1.15
Automated cherry pick of #87507: Revert "It fixes a bug where AAD token obtained by

Kubernetes-commit: e53f3c3d4b1dfc819d3b03b591ce93df292bef2d
2020-01-31 08:00:21 -08:00
Weinong Wang
4bd5b4c230 Revert "It fixes a bug where AAD token obtained by kubectl is incompatible with on-behalf-of flow and oidc."
This reverts commit d1480ab49d603d0a95e509b627252ee7af8559ae.

Revert this commit due to incomplete migration path

Kubernetes-commit: b0f89fcad42eb6fe786de7b382a7b46cb83a1b42
2020-01-23 14:21:33 -08:00
CJ Cullen
fba74aef0c update gopkg.in/yaml.v2 to v2.2.8
Kubernetes-commit: f22f9c2ce994edbbd1b1a91cae0ffeebe273ea76
2020-01-22 11:32:39 -08: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
3 changed files with 11 additions and 11 deletions

6
Godeps/Godeps.json generated
View File

@@ -184,15 +184,15 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.4"
"Rev": "v2.2.8"
},
{
"ImportPath": "k8s.io/api",
"Rev": "v0.15.7"
"Rev": "v0.15.10"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "v0.15.7"
"Rev": "v0.15.10"
},
{
"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.15.7
k8s.io/apimachinery v0.15.7
k8s.io/api v0.15.10
k8s.io/apimachinery v0.15.10
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.15.7
k8s.io/apimachinery => k8s.io/apimachinery v0.15.7
k8s.io/api => k8s.io/api v0.15.10
k8s.io/apimachinery => k8s.io/apimachinery v0.15.10
)

8
go.sum
View File

@@ -91,10 +91,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
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.15.7/go.mod h1:a/tUxscL+UxvYyA7Tj5DRc8ivYqJIO1Y5KDdlI6wSvo=
k8s.io/apimachinery v0.15.7/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.15.10/go.mod h1:PffiEKNf0aFiv2naEYSGTFHIGA9V8Qwt22DZIAokOzQ=
k8s.io/apimachinery v0.15.10/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
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=