Skip to content

Commit 11f18f3

Browse files
Jeff PeelerVille Aikas
Jeff Peeler
authored and
Ville Aikas
committed
Switch to wget for integration apiserver checks (openshift#1384)
The NSS encryption library does not allow a CA to be used with the extended key usage present, at least in the way we are currently doing so. The generated self signed certificates extension section looks like: ... X509v3 extensions: X509v3 Key Usage: critical Digital Signature, Key Encipherment, Certificate Sign X509v3 Extended Key Usage: TLS Web Server Authentication X509v3 Basic Constraints: critical CA:TRUE X509v3 Subject Alternative Name: DNS:localhost, IP Address:127.0.0.1, IP Address:127.0.0.1 Testing with the extended key usage removed allows curl to work, but simply switching to wget will allow integration tests to work on Fedora immediately. Related issue: kubernetes/client-go#311 (Also make sure when testing new certificates to delete certificates previously generated in .var/run/kubernetes-service-catalog/. Existing certificates are not overwritten if they already exist.)
1 parent 8c44a7d commit 11f18f3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: contrib/hack/start-server.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ count=0
5252
D_HOST=${DOCKER_HOST:-localhost}
5353
D_HOST=${D_HOST#*//} # remove leading proto://
5454
D_HOST=${D_HOST%:*} # remove trailing port #
55-
while ! curl --cacert ${ROOT}/.var/run/kubernetes-service-catalog/apiserver.crt https://${D_HOST}:${PORT} > /dev/null 2>&1 ; do
55+
while ! wget --ca-certificate ${ROOT}/.var/run/kubernetes-service-catalog/apiserver.crt https://${D_HOST}:${PORT} > /dev/null 2>&1 ; do
5656
sleep 1
5757
(( count++ )) || true
5858
if [ "${count}" == "30" ]; then
5959
echo "Timed-out waiting for API Server"
60-
(set -x ; curl --cacert ${ROOT}/.var/run/kubernetes-service-catalog/apiserver.crt https://${D_HOST}:${PORT})
60+
(set -x ; wget --ca-certificate ${ROOT}/.var/run/kubernetes-service-catalog/apiserver.crt https://${D_HOST}:${PORT})
6161
(set -x ; docker ps)
6262
(set -x ; docker logs apiserver)
6363
exit 1

0 commit comments

Comments
 (0)