github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56392 from porridge/unmute-cfssl-curl 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Unmute curl when fetching cfssl.

**What this PR does / why we need it**:
This is a step forward towards fixing #55589.

**Release note**:
```release-note
NONE
```

/kind bug
@kubernetes/sig-scalability - affects our tests
@kubernetes/sig-test-infra - it's a bug in kube-up, please add to v1.9 and approve
/priority critical-urgent
pull/6/head
Kubernetes Submit Queue 2017-11-29 00:06:23 -08:00 committed by GitHub
parent 2c9ffc0e88 69dd010a41
commit 072c98ceb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/lib/util.sh
View File

@ -737,12 +737,12 @@ function kube::util::ensure-cfssl {
kernel=$(uname -s) kernel=$(uname -s)
case "${kernel}" in case "${kernel}" in
Linux) Linux)
curl --retry 10 -s -L -o cfssl https://pkg.cfssl.org/R1.2/cfssl_linux-amd64 curl --retry 10 -L -o cfssl https://pkg.cfssl.org/R1.2/cfssl_linux-amd64
curl --retry 10 -s -L -o cfssljson https://pkg.cfssl.org/R1.2/cfssljson_linux-amd64 curl --retry 10 -L -o cfssljson https://pkg.cfssl.org/R1.2/cfssljson_linux-amd64
;; ;;
Darwin) Darwin)
curl --retry 10 -s -L -o cfssl https://pkg.cfssl.org/R1.2/cfssl_darwin-amd64 curl --retry 10 -L -o cfssl https://pkg.cfssl.org/R1.2/cfssl_darwin-amd64
curl --retry 10 -s -L -o cfssljson https://pkg.cfssl.org/R1.2/cfssljson_darwin-amd64 curl --retry 10 -L -o cfssljson https://pkg.cfssl.org/R1.2/cfssljson_darwin-amd64
;; ;;
*) *)
echo "Unknown, unsupported platform: ${kernel}." >&2 echo "Unknown, unsupported platform: ${kernel}." >&2