Skip to content

Commit 2138ec0

Browse files
Refactor logic for OSX etcd cURL statement
The previous implementation of this statement would have caused two cURL executions on MacOS. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent 6ee94d0 commit 2138ec0

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

hack/lib/util/misc.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,10 @@ function os::util::curl_etcd() {
183183

184184
curl --fail --silent --cacert "${ca_bundle}" \
185185
--cert "${etcd_client_cert_p12}:${etcd_client_cert_p12_password}" "${full_url}"
186+
else
187+
curl --fail --silent --cacert "${ca_bundle}" \
188+
--cert "${etcd_client_cert}" --key "${etcd_client_key}" "${full_url}"
186189
fi
187-
188-
189-
curl --fail --silent --cacert "${ca_bundle}" \
190-
--cert "${etcd_client_cert}" --key "${etcd_client_key}" "${full_url}"
191190
}
192191

193192
# os::util::host_platform determines what the host OS and architecture

0 commit comments

Comments
 (0)