openshift · openshift-merge-robot · Oct 24, 2019 · Oct 10, 2018 · Dec 18, 2018 · Dec 15, 2018
diff --git a/.dockerignore b/.dockerignore
@@ -1 +0,0 @@
-.git

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@
 /coverage
 /covdir
 /docs
-/vendor
 /gopath
 /gopath.proto
 /go-bindata

diff --git a/.travis.yml b/.travis.yml
@@ -6,68 +6,61 @@ sudo: required
 services: docker
 
 go:
-- 1.10.4
+- 1.12.9
+
+env:
+- GO111MODULE=on
 
 notifications:
   on_success: never
   on_failure: never
 
 env:
   matrix:
-  - TARGET=linux-amd64-integration
+  - TARGET=linux-amd64-integration-1-cpu
+  - TARGET=linux-amd64-integration-4-cpu
   - TARGET=linux-amd64-functional
   - TARGET=linux-amd64-unit
+  - TARGET=linux-amd64-e2e
   - TARGET=all-build
   - TARGET=linux-386-unit
 
 matrix:
   fast_finish: true
   allow_failures:
-  - go: 1.10.4
-    env: TARGET=linux-386-unit
-  exclude:
-  - go: tip
+  - go: 1.12.9
     env: TARGET=linux-386-unit
 
-before_install:
-- if [[ $TRAVIS_GO_VERSION == 1.* ]]; then docker pull gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION}; fi
-
 install:
-- pushd cmd/etcd && go get -t -v ./... && popd
+- go get -t -v -d ./...
 
 script:
  - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
  - >
     case "${TARGET}" in
-      linux-amd64-integration)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=amd64 PASSES='integration' ./test"
+      linux-amd64-integration-1-cpu)
+        GOARCH=amd64 CPU=1 PASSES='integration' ./test
+        ;;
+      linux-amd64-integration-4-cpu)
+        GOARCH=amd64 CPU=4 PASSES='integration' ./test
         ;;
       linux-amd64-functional)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "./build && GOARCH=amd64 PASSES='functional' ./test"
+        ./build && GOARCH=amd64 PASSES='functional' ./test
         ;;
       linux-amd64-unit)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=amd64 PASSES='unit' ./test"
+        ./build && GOARCH=amd64 PASSES='unit' ./test
+        ;;
+      linux-amd64-e2e)
+        GOARCH=amd64 PASSES='build release e2e' MANUAL_VER=v3.3.13 ./test
         ;;
       all-build)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=amd64 PASSES='build' ./test \
-            && GOARCH=386 PASSES='build' ./test \
-            && GO_BUILD_FLAGS='-v' GOOS=darwin GOARCH=amd64 ./build \
-            && GO_BUILD_FLAGS='-v' GOOS=windows GOARCH=amd64 ./build \
-            && GO_BUILD_FLAGS='-v' GOARCH=arm ./build \
-            && GO_BUILD_FLAGS='-v' GOARCH=arm64 ./build \
-            && GO_BUILD_FLAGS='-v' GOARCH=ppc64le ./build"
+        GOARCH=386 PASSES='build' ./test \
+          && GO_BUILD_FLAGS='-v' GOOS=darwin GOARCH=amd64 ./build \
+          && GO_BUILD_FLAGS='-v' GOARCH=arm ./build \
+          && GO_BUILD_FLAGS='-v' GOARCH=arm64 ./build \
+          && GO_BUILD_FLAGS='-v' GOARCH=ppc64le ./build
         ;;
       linux-386-unit)
-        docker run --rm \
-          --volume=`pwd`:/go/src/github.com/coreos/etcd gcr.io/etcd-development/etcd-test:go${TRAVIS_GO_VERSION} \
-          /bin/bash -c "GOARCH=386 PASSES='unit' ./test"
+        GOARCH=386 ./build && GOARCH=386 PASSES='unit' ./test
         ;;
     esac
diff --git a/.words b/.words
@@ -41,4 +41,4 @@ too_many_pings
 uncontended
 unprefixed
 unlisting
-
+WithDialer
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -0,0 +1,19 @@
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
+
+WORKDIR /go/src/github.com/coreos/etcd
+
+COPY . .
+
+RUN ./build
+
+# stage 2
+FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
+
+ENTRYPOINT ["/usr/bin/etcd"]
+
+COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/
+COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/
+
+LABEL io.k8s.display-name="etcd server" \
+      io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \
+      maintainer="Sam Batschelet <[email protected]>"
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -0,0 +1,19 @@
+FROM openshift/golang-builder:1.12 AS builder
+
+WORKDIR /go/src/github.com/coreos/etcd
+
+COPY . .
+
+RUN ./build
+
+# stage 2
+FROM openshift/origin-base
+
+ENTRYPOINT ["/usr/bin/etcd"]
+
+COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcd /usr/bin/
+COPY --from=builder /go/src/github.com/coreos/etcd/bin/etcdctl /usr/bin/
+
+LABEL io.k8s.display-name="etcd server" \
+      io.k8s.description="etcd is a distributed key-value store which stores the persistent master state for Kubernetes and OpenShift." \
+      maintainer="Sam Batschelet <[email protected]>"
diff --git a/Documentation/_index.md b/Documentation/_index.md
@@ -0,0 +1,3 @@
+---
+title: etcd version 3.3.12
+---
diff --git a/Documentation/benchmarks/README.md b/Documentation/benchmarks/README.md
diff --git a/Documentation/benchmarks/_index.md b/Documentation/benchmarks/_index.md
@@ -0,0 +1,3 @@
+---
+title: Benchmarks
+---
diff --git a/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md b/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md
@@ -1,3 +1,7 @@
+---
+title: Benchmarking etcd v2.1.0
+---
+
 ## Physical machines
 
 GCE n1-highcpu-2 machine type

diff --git a/Documentation/benchmarks/etcd-2-2-0-benchmarks.md b/Documentation/benchmarks/etcd-2-2-0-benchmarks.md
@@ -1,4 +1,6 @@
-# Benchmarking etcd v2.2.0
+---
+title: Benchmarking etcd v2.2.0
+---
 
 ## Physical Machines
 
@@ -26,7 +28,7 @@ Go OS/Arch: linux/amd64
 
 Bootstrap another machine, outside of the etcd cluster, and run the [`hey` HTTP benchmark tool](https://github.com/rakyll/hey) with a connection reuse patch to send requests to each etcd cluster member. See the [benchmark instructions](../../hack/benchmark/) for the patch and the steps to reproduce our procedures.
 
-The performance is calulated through results of 100 benchmark rounds.
+The performance is calculated through results of 100 benchmark rounds.
 
 ## Performance
 

diff --git a/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md b/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md
@@ -1,4 +1,8 @@
-## Physical machines
+---
+title: Benchmarking etcd v2.2.0-rc
+---
+
+## Physical machine
 
 GCE n1-highcpu-2 machine type
 

diff --git a/Documentation/benchmarks/etcd-2-2-0-rc-memory-benchmarks.md b/Documentation/benchmarks/etcd-2-2-0-rc-memory-benchmarks.md
@@ -1,3 +1,7 @@
+---
+title: Benchmarking etcd v2.2.0-rc-memory
+---
+
 ## Physical machine
 
 GCE n1-standard-2 machine type

diff --git a/Documentation/benchmarks/etcd-3-demo-benchmarks.md b/Documentation/benchmarks/etcd-3-demo-benchmarks.md
@@ -1,3 +1,7 @@
+---
+title: Benchmarking etcd v3
+---
+
 ## Physical machines
 
 GCE n1-highcpu-2 machine type

diff --git a/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md b/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md
@@ -1,4 +1,6 @@
-# Watch Memory Usage Benchmark
+---
+title: Watch Memory Usage Benchmark
+---
 
 *NOTE*: The watch features are under active development, and their memory usage may change as that development progresses. We do not expect it to significantly increase beyond the figures stated below.
 

diff --git a/Documentation/benchmarks/etcd-storage-memory-benchmark.md b/Documentation/benchmarks/etcd-storage-memory-benchmark.md
@@ -1,4 +1,6 @@
-# Storage Memory Usage Benchmark
+---
+title: Storage Memory Usage Benchmark
+---
 
 <!---todo: link storage to storage design doc-->
 Two components of etcd storage consume physical memory. The etcd process allocates an *in-memory index* to speed key lookup. The process's *page cache*, managed by the operating system, stores recently-accessed data from disk for quick re-use.

diff --git a/Documentation/branch_management.md b/Documentation/branch_management.md
@@ -1,4 +1,6 @@
-# Branch management
+---
+title: Branch management
+---
 
 ## Guide
 

diff --git a/Documentation/demo.md b/Documentation/demo.md
@@ -1,4 +1,6 @@
-# Demo
+---
+title: Demo
+---
 
 This series of examples shows the basic procedures for working with an etcd cluster.
 

diff --git a/Documentation/dev-guide/_index.md b/Documentation/dev-guide/_index.md
@@ -0,0 +1,3 @@
+---
+title: Developer guide
+---
diff --git a/Documentation/dev-guide/api_concurrency_reference_v3.md b/Documentation/dev-guide/api_concurrency_reference_v3.md
@@ -1,4 +1,6 @@
-### etcd concurrency API Reference
+---
+title: etcd concurrency API Reference
+---
 
 
 This is a generated documentation. Please read the proto files for more.
@@ -20,7 +22,7 @@ The lock service exposes client-side locking facilities as a gRPC interface.
 | Field | Description | Type |
 | ----- | ----------- | ---- |
 | name | name is the identifier for the distributed shared lock to be acquired. | bytes |
-| lease | lease is the ID of the lease that will be attached to ownership of the lock. If the lease expires or is revoked and currently holds the lock, the lock is automatically released. Calls to Lock with the same lease will be treated as a single acquistion; locking twice with the same lease is a no-op. | int64 |
+| lease | lease is the ID of the lease that will be attached to ownership of the lock. If the lease expires or is revoked and currently holds the lock, the lock is automatically released. Calls to Lock with the same lease will be treated as a single acquisition; locking twice with the same lease is a no-op. | int64 |