Merge pull request #226 from tjungblu/rebase_4_14_3_5_10

OCPBUGS-22727: [4.14] Rebase openshift/etcd to 3.5.10

.github/workflows/e2e.yaml

@@ -1,11 +1,8 @@
 name: E2E
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
@@ -14,9 +11,11 @@ jobs:
         - linux-386-e2e
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
@@ -26,10 +25,10 @@ jobs:
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-e2e)
-            PASSES='build release e2e' MANUAL_VER=v3.4.7 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh
+            CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' make test-e2e-release
             ;;
           linux-386-e2e)
-            GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh
+            GOARCH=386 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' make test-e2e
             ;;
           *)
             echo "Failed to find target"

.github/workflows/functional.yaml

@@ -1,21 +1,20 @@
 name: functional-tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
         target:
         - linux-amd64-functional
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}

.github/workflows/grpcproxy.yaml

@@ -1,21 +1,20 @@
 name: grpcProxy-tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: true
       matrix:
         target:
         - linux-amd64-grpcproxy
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}

.github/workflows/release.yaml

@@ -1,16 +1,15 @@
 name: Release
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   main:
     runs-on: ubuntu-latest
-    needs: goversion
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - name: release
       run: |
         set -euo pipefail

.github/workflows/tests.yaml

@@ -1,11 +1,8 @@
 name: Tests
 on: [push, pull_request]
 jobs:
-  goversion:
-    uses: ./.github/workflows/go-version.yaml
   test:
     runs-on: ubuntu-latest
-    needs: goversion
     strategy:
       fail-fast: false
       matrix:
@@ -19,9 +16,11 @@ jobs:
         - linux-386-unit-1-cpu
     steps:
     - uses: actions/checkout@v2
+    - id: goversion
+      run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
     - uses: actions/setup-go@v2
       with:
-        go-version: ${{ needs.goversion.outputs.goversion }}
+        go-version: ${{ steps.goversion.outputs.goversion }}
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
@@ -34,16 +33,16 @@ jobs:
             GOARCH=amd64 PASSES='fmt bom dep' ./test.sh
             ;;
           linux-amd64-integration-1-cpu)
-            GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=1 RACE='false' make test-integration
             ;;
           linux-amd64-integration-2-cpu)
-            GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=2 RACE='false' make test-integration
             ;;
           linux-amd64-integration-4-cpu)
-            GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=4 RACE='false' make test-integration
             ;;
           linux-amd64-unit-4-cpu-race)
-            GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./test.sh -p=2
+            GOARCH=amd64 RACE='true' CPU='4' GO_TEST_FLAGS='-p=2' make test-unit
             ;;
           all-build)
             GOARCH=amd64 PASSES='build' ./test.sh
@@ -57,7 +56,7 @@ jobs:
             GO_BUILD_FLAGS='-v -mod=readonly' GOARCH=s390x ./build.sh
             ;;
           linux-386-unit-1-cpu)
-            GOARCH=386 PASSES='unit' RACE='false' CPU='1' ./test -p=4
+            GOARCH=386 RACE='false' CPU='1' GO_TEST_FLAGS='-p=4' make test-unit
             ;;
           *)
             echo "Failed to find target"

.go-version

@@ -1 +1 @@
-1.19.9
+1.20.10

Documentation/dev-guide/apispec/swagger/rpc.swagger.json

@@ -1276,6 +1276,39 @@
       }
     },
     "/v3/maintenance/hash": {
+      "post": {
+        "tags": [
+          "Maintenance"
+        ],
+        "summary": "Hash computes the hash of whole backend keyspace,\nincluding key, lease, and other buckets in storage.\nThis is designed for testing ONLY!\nDo not rely on this in production with ongoing transactions,\nsince Hash operation does not hold MVCC locks.\nUse \"HashKV\" API instead for \"key\" bucket consistency checks.",
+        "operationId": "Maintenance_Hash",
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/etcdserverpbHashRequest"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/etcdserverpbHashResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response",
+            "schema": {
+              "$ref": "#/definitions/runtimeError"
+            }
+          }
+        }
+      }
+    },
+    "/v3/maintenance/hashkv": {
       "post": {
         "tags": [
           "Maintenance"

Makefile

@@ -55,7 +55,7 @@ docker-remove:
 
 
 
-GO_VERSION ?= 1.19.9
+GO_VERSION ?= $(shell cat .go-version)
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@@ -161,6 +161,22 @@ test-full:
 	$(info log-file: test-$(TEST_SUFFIX).log)
 	PASSES="fmt build release unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log
 
+.PHONY: test-unit
+test-unit:
+	PASSES="unit" ./test.sh $(GO_TEST_FLAGS)
+
+.PHONY: test-integration
+test-integration:
+	PASSES="integration" ./test.sh $(GO_TEST_FLAGS)
+
+.PHONY: test-e2e
+test-e2e:
+	PASSES="build e2e" ./test.sh $(GO_TEST_FLAGS)
+
+.PHONY: test-e2e-release
+test-e2e-release:
+	PASSES="build release e2e" ./test.sh $(GO_TEST_FLAGS)
+
 ensure-docker-test-image-exists:
 	make pull-docker-test || ( echo "WARNING: Container Image not found in registry, building locally"; make build-docker-test )