kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112674 from iutx/optimize/oidc-test 

Optimize authenticator oidc test

Kubernetes-commit: cac53883f4714452f3084a22e4be20d042a9df33
This commit is contained in:
Kubernetes Publisher 2022-09-24 17:40:04 -07:00
parent f6346f1d45 70f028d4e0
commit b4755b9b81
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@ -41,8 +41,8 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20220922184533-be233f856791 k8s.io/api v0.0.0-20220922184533-be233f856791
k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875 k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875
k8s.io/client-go v0.0.0-20220922185149-be20b2bd91d8 k8s.io/client-go v0.0.0-20220924224402-c81636cd4415
k8s.io/component-base v0.0.0-20220922190256-94e3f30688a2 k8s.io/component-base v0.0.0-20220922224627-99626e01385c
k8s.io/klog/v2 v2.80.1 k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/utils v0.0.0-20220922133306-665eaaec4324 k8s.io/utils v0.0.0-20220922133306-665eaaec4324
@ -119,7 +119,7 @@ require (
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220922184533-be233f856791 k8s.io/api => k8s.io/api v0.0.0-20220922184533-be233f856791
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289
k8s.io/client-go => k8s.io/client-go v0.0.0-20220922185149-be20b2bd91d8 k8s.io/client-go => k8s.io/client-go v0.0.0-20220924224402-c81636cd4415
k8s.io/component-base => k8s.io/component-base v0.0.0-20220922190256-94e3f30688a2 k8s.io/component-base => k8s.io/component-base v0.0.0-20220922224627-99626e01385c
) )

12
go.sum
View File

@ -977,12 +977,12 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220922184533-be233f856791 h1:kLrF39Nhp2qBtW+YFWmkQ8UHIgrVZ1k4baVdEzrUqDs= k8s.io/api v0.0.0-20220922184533-be233f856791 h1:kLrF39Nhp2qBtW+YFWmkQ8UHIgrVZ1k4baVdEzrUqDs=
k8s.io/api v0.0.0-20220922184533-be233f856791/go.mod h1:qd3JkJgL4kOc9vpeehxgQWgM5jRR+g5KDXB1jTQCKss= k8s.io/api v0.0.0-20220922184533-be233f856791/go.mod h1:qd3JkJgL4kOc9vpeehxgQWgM5jRR+g5KDXB1jTQCKss=
k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875 h1:yuWcGJBlIusScLvx6FPwJRZ3OKOmz/klpSdq6nxf/Yw= k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289 h1:Y1uCEALGf5wi4ccjoxi4/84wKfj/A97zZtE2i2RPeuc=
k8s.io/apimachinery v0.0.0-20220922184044-826a74e82875/go.mod h1:zdDPkAEkslrVOG1IzqRpqLwHlA/W9IhQ6nE1h5IJ7ME= k8s.io/apimachinery v0.0.0-20220922184044-7fb78ee96289/go.mod h1:zdDPkAEkslrVOG1IzqRpqLwHlA/W9IhQ6nE1h5IJ7ME=
k8s.io/client-go v0.0.0-20220922185149-be20b2bd91d8 h1:Ywvxf9XgMPbm95ux7ZkhxPoQzTlbCKliGzi6qn7JiQk= k8s.io/client-go v0.0.0-20220924224402-c81636cd4415 h1:x6hwkLco2wvASJ6FY7CXnslQmTfUNUoRgTSXXUDrhgQ=
k8s.io/client-go v0.0.0-20220922185149-be20b2bd91d8/go.mod h1:cXHINc+BC9+6ds8veWKpUm66Vj7xWm+WC5uoiJtkaWc= k8s.io/client-go v0.0.0-20220924224402-c81636cd4415/go.mod h1:qz3xi6RjBK5mJeOFjoUc/2YyG00QSWqI1aiXktbV/gY=
k8s.io/component-base v0.0.0-20220922190256-94e3f30688a2 h1:ic/2RtAIZVz82nHEdeo1USjI4/iNUDZoiCzSvOMTlec= k8s.io/component-base v0.0.0-20220922224627-99626e01385c h1:MMJd5kkNFltwAvhZZ8BjGpjxMB9Vd3uurl0b/Ue9v94=
k8s.io/component-base v0.0.0-20220922190256-94e3f30688a2/go.mod h1:miJ/+x/stZ5GvhmfEz1ThunblWfRNNHrfDPBp0yJgbc= k8s.io/component-base v0.0.0-20220922224627-99626e01385c/go.mod h1:aMC4joQZNaWC/oEPVeFmKZzUYKohGsXqvZnr1AAMDoo=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=

4
plugin/pkg/authenticator/token/oidc/oidc_test.go
View File

@ -25,9 +25,9 @@ import (
"encoding/json" "encoding/json"
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
@ -76,7 +76,7 @@ func loadECDSAPrivKey(t *testing.T, filepath string, alg jose.SignatureAlgorithm
} }
func loadKey(t *testing.T, filepath string, alg jose.SignatureAlgorithm, unmarshal func([]byte) (interface{}, error)) *jose.JSONWebKey { func loadKey(t *testing.T, filepath string, alg jose.SignatureAlgorithm, unmarshal func([]byte) (interface{}, error)) *jose.JSONWebKey {
data, err := ioutil.ReadFile(filepath) data, err := os.ReadFile(filepath)
if err != nil { if err != nil {
t.Fatalf("load file: %v", err) t.Fatalf("load file: %v", err)
} }