Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: migrate to "golang/dep" #9155

Merged
merged 19 commits into from
Jan 25, 2018
Merged

vendor: migrate to "golang/dep" #9155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
505d24c
scripts/updatedep.sh: use "golang/dep"
gyuho Jan 16, 2018
fa9f3dd
glide: remove
gyuho Jan 16, 2018
b1e87f8
cmd: move "cmd/vendor" to root, remove "cmd"
gyuho Jan 16, 2018
4fc2db7
gitignore: ignore test files in "vendor"
gyuho Jan 16, 2018
65ee3a0
Gopkg.toml: initial commit
gyuho Jan 16, 2018
970ab0b
vendor: regenerate
gyuho Jan 16, 2018
b5d5ce4
Gopkg.lock: initial commit
gyuho Jan 16, 2018
b596c3c
tools/functional-tester: update "build" script
gyuho Jan 15, 2018
698ec7f
scripts/updatebom.sh: remove "./cmd/vendor"
gyuho Jan 15, 2018
ab24938
Documentation/dl_build: remove "./cmd/etcd"
gyuho Jan 15, 2018
66d6a39
Documentation/op-guide: remove "./cmd/vendor" in monitoring.md
gyuho Jan 15, 2018
c8e5311
Dockerfile: remove "cmd/vendor"
gyuho Jan 15, 2018
6eefc93
test: remove "./cmd", "etcd_setup_gopath"
gyuho Jan 15, 2018
97cd2a4
client,clientv3: remove "cmd/vendor" in README.md
gyuho Jan 15, 2018
ab7c319
travis.yml: remove "./cmd"
gyuho Jan 15, 2018
a270a91
build.ps1: remove "cmd/vendor"
gyuho Jan 15, 2018
4d06d32
build: remove "./cmd/etcd,etcdctl"
gyuho Jan 15, 2018
fcfbeb3
tools/benchmark/cmd: fix fmt warning in import path
gyuho Jan 17, 2018
96a0392
build: specify target with "${REPO_PATH}"
gyuho Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 18 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,21 @@ hack/scripts-dev/docker-dns/.Dockerfile
hack/scripts-dev/docker-dns-srv/.Dockerfile
hack/tls-setup/certs
.idea

# TODO: use dep prune
# https://github.com/golang/dep/issues/120#issuecomment-306518546
vendor/**/*
!vendor/**/
!vendor/**/*.go
!vendor/**/*.c
!vendor/**/*.cpp
!vendor/**/*.s
!vendor/**/COPYING*
!vendor/**/PATENTS*
!vendor/**/NOTICE*
!vendor/**/Licence*
!vendor/**/License*
!vendor/**/LICENCE*
!vendor/**/LICENSE*
vendor/**/*_test.go

2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ before_install:
- docker pull gcr.io/etcd-development/etcd-test:go1.9.3

install:
- pushd cmd/etcd && go get -t -v ./... && popd
- go get -t -v ./...

script:
- >
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM golang
ADD . /go/src/github.com/coreos/etcd
ADD cmd/vendor /go/src/github.com/coreos/etcd/vendor
RUN go install github.com/coreos/etcd
EXPOSE 2379 2380
ENTRYPOINT ["etcd"]
11 changes: 1 addition & 10 deletions Documentation/dl_build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ To build a vendored `etcd` from the `master` branch via `go get`:
# GOPATH should be set
$ echo $GOPATH
/Users/example/go
$ go get github.com/coreos/etcd/cmd/etcd
```

To build `etcd` from the `master` branch without vendoring (may not build due to upstream conflicts):

```sh
# GOPATH should be set
$ echo $GOPATH
/Users/example/go
$ go get github.com/coreos/etcd
$ go get -v github.com/coreos/etcd
```

## Test the installation
Expand Down
12 changes: 6 additions & 6 deletions Documentation/op-guide/monitoring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ Showing top 10 nodes out of 157 (cum >= 10ms)
flat flat% sum% cum cum%
130ms 27.08% 27.08% 130ms 27.08% runtime.futex
70ms 14.58% 41.67% 70ms 14.58% syscall.Syscall
20ms 4.17% 45.83% 20ms 4.17% github.com/coreos/etcd/cmd/vendor/golang.org/x/net/http2/hpack.huffmanDecode
20ms 4.17% 45.83% 20ms 4.17% github.com/coreos/etcd/vendor/golang.org/x/net/http2/hpack.huffmanDecode
20ms 4.17% 50.00% 30ms 6.25% runtime.pcvalue
20ms 4.17% 54.17% 50ms 10.42% runtime.schedule
10ms 2.08% 56.25% 10ms 2.08% github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx
10ms 2.08% 58.33% 10ms 2.08% github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).Lead
10ms 2.08% 60.42% 10ms 2.08% github.com/coreos/etcd/cmd/vendor/github.com/coreos/etcd/pkg/wait.(*timeList).Trigger
10ms 2.08% 62.50% 10ms 2.08% github.com/coreos/etcd/cmd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues
10ms 2.08% 64.58% 10ms 2.08% github.com/coreos/etcd/cmd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders
10ms 2.08% 56.25% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx
10ms 2.08% 58.33% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).Lead
10ms 2.08% 60.42% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/pkg/wait.(*timeList).Trigger
10ms 2.08% 62.50% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues
10ms 2.08% 64.58% 10ms 2.08% github.com/coreos/etcd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders
```

The `/debug/requests` endpoint gives gRPC traces and performance statistics through a web browser. For example, here is a `Range` request for the key `abc`:
Expand Down
Loading