Unverified Commit 3bcd7cee authored by Derek Nola's avatar Derek Nola Committed by GitHub

[Release-1.23] Update etcd error to match correct url (#5949)

* Update etcd error to match correct url * Bump macos version used in GH actions. Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com>
parent 313dd6e5
...@@ -37,7 +37,7 @@ jobs: ...@@ -37,7 +37,7 @@ jobs:
name: "Conformance Test" name: "Conformance Test"
needs: prep needs: prep
# nested virtualization is only available on macOS hosts # nested virtualization is only available on macOS hosts
runs-on: macos-10.15 runs-on: macos-12
timeout-minutes: 40 timeout-minutes: 40
strategy: strategy:
fail-fast: false fail-fast: false
......
...@@ -15,7 +15,7 @@ on: ...@@ -15,7 +15,7 @@ on:
jobs: jobs:
test: test:
name: "Smoke Test" name: "Smoke Test"
runs-on: macos-10.15 runs-on: macos-12
timeout-minutes: 40 timeout-minutes: 40
strategy: strategy:
fail-fast: false fail-fast: false
......
...@@ -37,7 +37,7 @@ jobs: ...@@ -37,7 +37,7 @@ jobs:
name: "Smoke Test" name: "Smoke Test"
needs: prep needs: prep
# nested virtualization is only available on macOS hosts # nested virtualization is only available on macOS hosts
runs-on: macos-10.15 runs-on: macos-12
timeout-minutes: 40 timeout-minutes: 40
strategy: strategy:
fail-fast: false fail-fast: false
......
...@@ -224,7 +224,7 @@ func (e *ETCD) Test(ctx context.Context) error { ...@@ -224,7 +224,7 @@ func (e *ETCD) Test(ctx context.Context) error {
memberNameUrls = append(memberNameUrls, member.Name+"="+member.PeerURLs[0]) memberNameUrls = append(memberNameUrls, member.Name+"="+member.PeerURLs[0])
} }
} }
return &MembershipError{Members: memberNameUrls, Self: e.name + "=" + e.address} return &MembershipError{Members: memberNameUrls, Self: e.name + "=" + e.peerURL()}
} }
// DBDir returns the path to dataDir/db/etcd // DBDir returns the path to dataDir/db/etcd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment