djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd/local-user-authenticator: use v1beta1 everywhere

Browse Source 
See 63f5416b2 for a previous time where we decided to use the v1beta1
TokenReview API.

Signed-off-by: Andrew Keesler <akeesler@vmware.com>
This commit is contained in:
Andrew Keesler 2020-09-11 12:14:12 -04:00
parent a3dbb309d0
commit 4e40c0320e
No known key found for this signature in database
GPG Key ID: 27CE0444346F9413
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/local-user-authenticator/main.go
View File

@ -27,7 +27,7 @@ import (
"time" "time"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
authenticationv1 "k8s.io/api/authentication/v1" authenticationv1beta1 "k8s.io/api/authentication/v1beta1"
k8serrors "k8s.io/apimachinery/pkg/api/errors" k8serrors "k8s.io/apimachinery/pkg/api/errors"
kubeinformers "k8s.io/client-go/informers" kubeinformers "k8s.io/client-go/informers"
corev1informers "k8s.io/client-go/informers/core/v1" corev1informers "k8s.io/client-go/informers/core/v1"
@ -184,14 +184,14 @@ func getUsernameAndPasswordFromRequest(rsp http.ResponseWriter, req *http.Reques
return "", "", invalidRequest return "", "", invalidRequest
} }
var body authenticationv1.TokenReview var body authenticationv1beta1.TokenReview
if err := json.NewDecoder(req.Body).Decode(&body); err != nil { if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
klog.InfoS("failed to decode body", "err", err) klog.InfoS("failed to decode body", "err", err)
rsp.WriteHeader(http.StatusBadRequest) rsp.WriteHeader(http.StatusBadRequest)
return "", "", invalidRequest return "", "", invalidRequest
} }
if body.APIVersion != authenticationv1.SchemeGroupVersion.String() { if body.APIVersion != authenticationv1beta1.SchemeGroupVersion.String() {
klog.InfoS("invalid TokenReview apiVersion", "apiVersion", body.APIVersion) klog.InfoS("invalid TokenReview apiVersion", "apiVersion", body.APIVersion)
rsp.WriteHeader(http.StatusBadRequest) rsp.WriteHeader(http.StatusBadRequest)
return "", "", invalidRequest return "", "", invalidRequest

10
cmd/local-user-authenticator/main_test.go
View File

@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
authenticationv1 "k8s.io/api/authentication/v1" authenticationv1beta1 "k8s.io/api/authentication/v1beta1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
@ -294,7 +294,7 @@ func TestWebhook(t *testing.T) {
body: func() (io.ReadCloser, error) { body: func() (io.ReadCloser, error) {
return newTokenReviewBody( return newTokenReviewBody(
user+":"+password, user+":"+password,
authenticationv1.SchemeGroupVersion.String(), authenticationv1beta1.SchemeGroupVersion.String(),
"wrong-kind", "wrong-kind",
) )
}, },
@ -489,7 +489,7 @@ func newClient(caBundle []byte, serverName string) *http.Client {
// newTokenReviewBody creates an io.ReadCloser that contains a JSON-encoded // newTokenReviewBody creates an io.ReadCloser that contains a JSON-encoded
// TokenReview request. // TokenReview request.
func newTokenReviewBody(token string, extra ...string) (io.ReadCloser, error) { func newTokenReviewBody(token string, extra ...string) (io.ReadCloser, error) {
v := authenticationv1.SchemeGroupVersion.String() v := authenticationv1beta1.SchemeGroupVersion.String()
if len(extra) > 0 { if len(extra) > 0 {
v = extra[0] v = extra[0]
} }
@ -500,12 +500,12 @@ func newTokenReviewBody(token string, extra ...string) (io.ReadCloser, error) {
} }
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
tr := authenticationv1.TokenReview{ tr := authenticationv1beta1.TokenReview{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
APIVersion: v, APIVersion: v,
Kind: k, Kind: k,
}, },
Spec: authenticationv1.TokenReviewSpec{ Spec: authenticationv1beta1.TokenReviewSpec{
Token: token, Token: token,
}, },
} }