Remove expiration string from session cookie

This change removes the "expires" key from the session cookie.  This
key is no longer required as it was superseded by the "exp" key in
3.11.  It was left is place to support mixed masters (3.10 / 3.11).
This logic can be safely removed since mixed masters of 3.11 and 4.0
are aware of the new "exp" key.  The "exp" key is represented as an
int64 instead of a string which makes it easier to parse.

Signed-off-by: Monis Khan <[email protected]>

Author: enj

pkg/oauthserver/server/session/authenticator.go

@@ -2,11 +2,8 @@ package session
 
 import (
 	"net/http"
-	"strconv"
 	"time"
 
-	"github.com/golang/glog"
-
 	"k8s.io/apiserver/pkg/authentication/user"
 )
 
@@ -16,9 +13,6 @@ const (
 
 	// expKey is stored as an int64 unix time
 	expKey = "exp"
-	// expiresKey is the string representation of expKey
-	// TODO drop in a release when mixed masters are no longer an issue
-	expiresKey = "expires"
 )
 
 type Authenticator struct {
@@ -37,22 +31,8 @@ func (a *Authenticator) AuthenticateRequest(req *http.Request) (user.Info, bool,
 	values := a.store.Get(req)
 
 	expires, ok := values.GetInt64(expKey)
-
-	// TODO drop this logic in a release when mixed masters are no longer an issue
 	if !ok {
-		// TODO replace with (in a release when mixed masters are no longer an issue):
-		// return nil, false, nil
-
-		expiresString, ok := values.GetString(expiresKey)
-		if !ok {
-			return nil, false, nil
-		}
-		expiresParse, err := strconv.ParseInt(expiresString, 10, 64)
-		if err != nil {
-			glog.Errorf("error parsing expires timestamp: %v", err)
-			return nil, false, nil
-		}
-		expires = expiresParse
+		return nil, false, nil
 	}
 
 	if expires < time.Now().Unix() {
@@ -92,12 +72,5 @@ func (a *Authenticator) put(w http.ResponseWriter, name, uid string, expires int
 
 	values[expKey] = expires
 
-	// TODO drop this logic in a release when mixed masters are no longer an issue
-	if expires == 0 {
-		values[expiresKey] = ""
-	} else {
-		values[expiresKey] = strconv.FormatInt(expires, 10)
-	}
-
 	return a.store.Put(w, values)
 }