Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
2bf728c6
Unverified
Commit
2bf728c6
authored
4 years ago
by
Márk Sági-Kazár
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1926 from dexidp/update-etcd-3.5
Update etcd to 3.5
parents
8e7ce635
356ccecc
No related branches found
No related tags found
No related merge requests found
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
go.mod
+6
-6
6 additions, 6 deletions
go.mod
go.sum
+249
-63
249 additions, 63 deletions
go.sum
storage/etcd/config.go
+3
-3
3 additions, 3 deletions
storage/etcd/config.go
storage/etcd/etcd.go
+1
-1
1 addition, 1 deletion
storage/etcd/etcd.go
storage/etcd/etcd_test.go
+1
-1
1 addition, 1 deletion
storage/etcd/etcd_test.go
with
260 additions
and
74 deletions
go.mod
+
6
−
6
View file @
2bf728c6
...
...
@@ -11,7 +11,6 @@ require (
github.com/ghodss/yaml
v1.0.0
github.com/go-ldap/ldap/v3
v3.2.4
github.com/go-sql-driver/mysql
v1.5.0
github.com/gogo/protobuf
v1.3.1 // indirect
github.com/golang/protobuf
v1.5.0
github.com/gorilla/handlers
v1.5.1
github.com/gorilla/mux
v1.8.0
...
...
@@ -24,18 +23,19 @@ require (
github.com/onsi/ginkgo
v1.8.0 // indirect
github.com/onsi/gomega
v1.5.0 // indirect
github.com/pkg/errors
v0.9.1
github.com/prometheus/client_golang
v1.
4.0
github.com/prometheus/client_golang
v1.
5.1
github.com/russellhaering/goxmldsig
v1.1.0
github.com/sirupsen/logrus
v1.8.1
github.com/spf13/cobra
v1.1.3
github.com/stretchr/testify
v1.7.0
go.etcd.io/etcd
v0.0.0-20191023171146-3cf2f69b5738
go.etcd.io/etcd/client/v3
v3.5.0-alpha.0
go.etcd.io/etcd/pkg/v3
v3.5.0-alpha.0
golang.org/x/crypto
v0.0.0-20201221181555-eec23a3978ad
golang.org/x/net
v0.0.0-20201224014010-6772e930b67b
golang.org/x/oauth2
v0.0.0-2020
0107190931-bf48bf16ab8d
golang.org/x/oauth2
v0.0.0-2020
1208152858-08078c50e5b5
golang.org/x/sys
v0.0.0-20201201145000-ef89a241ccb3 // indirect
google.golang.org/api
v0.
1
5.0
google.golang.org/grpc
v1.2
6
.0
google.golang.org/api
v0.
3
5.0
google.golang.org/grpc
v1.
3
2.0
google.golang.org/protobuf
v1.26.0
gopkg.in/square/go-jose.v2
v2.5.1
sigs.k8s.io/testing_frameworks
v0.1.2
...
...
This diff is collapsed.
Click to expand it.
go.sum
+
249
−
63
View file @
2bf728c6
This diff is collapsed.
Click to expand it.
storage/etcd/config.go
+
3
−
3
View file @
2bf728c6
...
...
@@ -3,9 +3,9 @@ package etcd
import
(
"time"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/namespace"
"go.etcd.io/etcd/pkg/transport"
clientv3
"go.etcd.io/etcd/client
/
v3"
"go.etcd.io/etcd/client
/
v3/namespace"
"go.etcd.io/etcd/pkg/
v3/
transport"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
...
...
This diff is collapsed.
Click to expand it.
storage/etcd/etcd.go
+
1
−
1
View file @
2bf728c6
...
...
@@ -7,7 +7,7 @@ import (
"strings"
"time"
"go.etcd.io/etcd/clientv3"
clientv3
"go.etcd.io/etcd/client
/
v3"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
...
...
This diff is collapsed.
Click to expand it.
storage/etcd/etcd_test.go
+
1
−
1
View file @
2bf728c6
...
...
@@ -10,7 +10,7 @@ import (
"time"
"github.com/sirupsen/logrus"
"go.etcd.io/etcd/clientv3"
clientv3
"go.etcd.io/etcd/client
/
v3"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment