Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
1692d58813 Fix Godeps.json to point to kubernetes-1.13.3-beta.0 tags 2019-01-11 03:27:07 +00:00
Kubernetes Publisher
73dad31f02 Merge pull request #72672 from liggitt/automated-cherry-pick-of-#72437-upstream-release-1.13
Automated cherry pick of #72437: Shorten re-read period for token files to work with

Kubernetes-commit: abc71e373ff5a5a701c5e48e2cd07b28f18b3b48
2019-01-10 19:35:54 +00:00
Jordan Liggitt
db82653708 Shorten re-read period for token files to work with ProjectedTokenVolumeSource
Kubernetes-commit: cf878b9332c8875ed0fcb8ce07cccd99547ce099
2018-12-29 22:18:28 -05:00
2 changed files with 39 additions and 39 deletions

66
Godeps/Godeps.json generated
View File

@@ -272,135 +272,135 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/auditregistration/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "6da7bf9cc208e9bd28a2d24c4337a2f83bed9f37"
"Rev": "1e21195e50b25b3b9a4e84eafbe3fe067e56f242"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",

View File

@@ -47,14 +47,14 @@ func TokenSourceWrapTransport(ts oauth2.TokenSource) func(http.RoundTripper) htt
func NewCachedFileTokenSource(path string) oauth2.TokenSource {
return &cachingTokenSource{
now: time.Now,
leeway: 1 * time.Minute,
leeway: 10 * time.Second,
base: &fileTokenSource{
path: path,
// This period was picked because it is half of the minimum validity
// duration for a token provisioned by they TokenRequest API. This is
// unsophisticated and should induce rotation at a frequency that should
// work with the token volume source.
period: 5 * time.Minute,
// This period was picked because it is half of the duration between when the kubelet
// refreshes a projected service account token and when the original token expires.
// Default token lifetime is 10 minutes, and the kubelet starts refreshing at 80% of lifetime.
// This should induce re-reading at a frequency that works with the token volume source.
period: time.Minute,
},
}
}