From 9fa27f6bf090482c10c1146a861e262d74140fb7 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Wed, 12 Jul 2017 09:52:13 -0700 Subject: [PATCH 1/2] bump(github.com/coreos/go-oidc): a4973d9a4225417aecf5d450a9522f00c1f7130f --- Godeps/Godeps.json | 42 +++++++++---------- vendor/github.com/coreos/go-oidc/http/http.go | 7 +++- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7d6b2a7721b..fcf43ba0bf1 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -740,23 +740,23 @@ }, { "ImportPath": "github.com/coreos/go-oidc/http", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/jose", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/key", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oauth2", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oidc", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-semver/semver", @@ -2147,82 +2147,82 @@ }, { "ImportPath": "github.com/opencontainers/runc/libcontainer", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/apparmor", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/fs", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/systemd", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/configs", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/configs/validate", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/criurpc", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/keys", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/label", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/seccomp", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/selinux", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/stacktrace", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/system", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/user", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/utils", - "Comment": "v1.0.0-rc2-49-gd223e2a", + "Comment": "v1.0.0-rc2-49-gd223e2ad", "Rev": "d223e2adae83f62d58448a799a5da05730228089" }, { diff --git a/vendor/github.com/coreos/go-oidc/http/http.go b/vendor/github.com/coreos/go-oidc/http/http.go index c3f51215133..48717833cab 100644 --- a/vendor/github.com/coreos/go-oidc/http/http.go +++ b/vendor/github.com/coreos/go-oidc/http/http.go @@ -91,7 +91,12 @@ func expires(date, expires string) (time.Duration, bool, error) { return 0, false, nil } - te, err := time.Parse(time.RFC1123, expires) + var te time.Time + var err error + if expires == "0" { + return 0, false, nil + } + te, err = time.Parse(time.RFC1123, expires) if err != nil { return 0, false, err } From 278789e639d50e40b4e3b8a3b98c9fcaec6a89c5 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Fri, 14 Jul 2017 14:59:50 -0600 Subject: [PATCH 2/2] Updating staging Godeps --- staging/src/k8s.io/apiserver/Godeps/Godeps.json | 10 +++++----- staging/src/k8s.io/client-go/Godeps/Godeps.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index ba0f5d17c44..d92755ffaf0 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -256,23 +256,23 @@ }, { "ImportPath": "github.com/coreos/go-oidc/http", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/jose", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/key", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oauth2", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oidc", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-semver/semver", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 0df8a27e1ff..cc8a4d68b44 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -40,23 +40,23 @@ }, { "ImportPath": "github.com/coreos/go-oidc/http", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/jose", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/key", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oauth2", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/go-oidc/oidc", - "Rev": "be73733bb8cc830d0205609b95d125215f8e9c70" + "Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f" }, { "ImportPath": "github.com/coreos/pkg/health",