Skip to content

Commit

Permalink
PWX-23110: update etcd to 3.4.24 (portworx#114)
Browse files Browse the repository at this point in the history
- use go modules instead of go dep
- use go.etcd.io/etcd instead of github.com/coreos/etcd
- update etcd to 3.4.24 both in the vendored code and in the test container
  • Loading branch information
pureneelesh authored Apr 5, 2023
1 parent 36b33a4 commit 8766683
Show file tree
Hide file tree
Showing 2,077 changed files with 641,707 additions and 687 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.idea
coverage.txt
profile.out
vendor
zookeeper/zookeeper.out
consul/kvdb_audit.log
etcd/v2/kvdb_audit.log
Expand Down
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ language: go
go:
- 1.17.13
install:
- curl -s -L https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o $GOPATH/bin/dep
- chmod +x $GOPATH/bin/dep
- go get -u github.com/vbatts/git-validation
- go install github.com/vbatts/git-validation@master
script:
- git-validation -run DCO,short-subject
- make deps docker-test
- make docker-test
notifications:
email:
recipients:
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile.kvdb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MAINTAINER [email protected]
RUN \
apt-get update -yq && \
apt-get install -yq --no-install-recommends \
btrfs-tools \
gcc \
g++ \
ca-certificates && \
Expand All @@ -15,9 +14,9 @@ RUN apt-get update && \
apt-get -y install unzip curl make git default-jre


RUN curl -s -L https://dl.google.com/go/go1.10.7.linux-amd64.tar.gz | tar -C /usr/local/ -xz && \
curl -s -L https://github.com/coreos/etcd/releases/download/v3.2.15/etcd-v3.2.15-linux-amd64.tar.gz -o /tmp/etcd-v3.2.15-linux-amd64.tar.gz && \
mkdir -p /tmp/test-etcd && tar xzvf /tmp/etcd-v3.2.15-linux-amd64.tar.gz -C /tmp/test-etcd --strip-components=1 && cp /tmp/test-etcd/etcd /usr/local/bin && \
RUN curl -s -L https://dl.google.com/go/go1.17.13.linux-amd64.tar.gz | tar -C /usr/local/ -xz && \
curl -s -L https://github.com/etcd-io/etcd/releases/download/v3.4.24/etcd-v3.4.24-linux-amd64.tar.gz -o /tmp/etcd-v3.4.24-linux-amd64.tar.gz && \
mkdir -p /tmp/test-etcd && tar xzvf /tmp/etcd-v3.4.24-linux-amd64.tar.gz -C /tmp/test-etcd --strip-components=1 && cp /tmp/test-etcd/etcd /usr/local/bin && \
curl -s -L https://releases.hashicorp.com/consul/1.0.0/consul_1.0.0_linux_amd64.zip -o /tmp/consul.zip && \
mkdir -p /tmp/test-consul && unzip /tmp/consul.zip -d /tmp/test-consul && cp /tmp/test-consul/consul /usr/local/bin/ && \
curl -s -L https://archive.apache.org/dist/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz -o /tmp/zookeeper-3.4.13.tar.gz && \
Expand Down
Loading

0 comments on commit 8766683

Please sign in to comment.