admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4013 from RolandMa1986/fix-merge

Browse Source 
Fix merge conflict
This commit is contained in:
KubeSphere CI Bot
2021-06-28 15:57:23 +08:00
committed by GitHub
parent ea1de55b9c d6f4311b43
commit 978f465a2b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/authentication/identityprovider/oidc/oidc.go
View File

@@ -28,7 +28,7 @@ import (
"kubesphere.io/kubesphere/pkg/utils/sliceutil"
oidc "github.com/coreos/go-oidc"
jwt "github.com/dgrijalva/jwt-go"
jwt "github.com/form3tech-oss/jwt-go"
"github.com/mitchellh/mapstructure"
"golang.org/x/oauth2"

2
pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go
View File

@@ -32,7 +32,7 @@ import (
"testing"
"time"
jwt "github.com/dgrijalva/jwt-go"
jwt "github.com/form3tech-oss/jwt-go"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"

2
pkg/apiserver/authentication/token/jwt.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"time"
jwt "github.com/dgrijalva/jwt-go"
jwt "github.com/form3tech-oss/jwt-go"
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/klog"
)

2
pkg/simple/client/devops/jenkins/request.go
View File

@@ -29,7 +29,7 @@ import (
"path/filepath"
"strings"
jwt "github.com/dgrijalva/jwt-go"
jwt "github.com/form3tech-oss/jwt-go"
authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token"
"kubesphere.io/kubesphere/pkg/simple/client/devops"