github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61307 from filbranden/curl1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61829, 61908, 61307, 61872, 60100). 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>.

Use curl instead of wget to fetch the CNI tarball in e2e-node test

**What this PR does / why we need it**:

Curl is more ubiquitous than wget. For instance, the GCE centos-7 and rhel-7 image families ship curl by default, but not wget.

Looking at the shell scripts under cluster/, they tend to use curl more than wget. (The ones that use wget, such as get-kube.sh, try curl first and only fallback to wget if it's not available.)

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:

Fixes running node e2e test on centos-7 or rhel-7 image families provided in GCE.

**Special notes for your reviewer**:

Tested by running node-e2e-test on Ubuntu, COS and CentOS.

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2018-03-29 17:37:12 -07:00
committed by GitHub
parent 7cf5974c42 451faff4ef
commit fe7514cfbc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/remote/utils.go
View File

@@ -56,7 +56,7 @@ func setupCNI(host, workspace string) error {
cniPath := filepath.Join(workspace, cniDirectory) cniPath := filepath.Join(workspace, cniDirectory)
cmd := getSSHCommand(" ; ", cmd := getSSHCommand(" ; ",
fmt.Sprintf("mkdir -p %s", cniPath), fmt.Sprintf("mkdir -p %s", cniPath),
fmt.Sprintf("wget -O - %s | tar -xz -C %s", cniURL, cniPath), fmt.Sprintf("curl -s -L %s | tar -xz -C %s", cniURL, cniPath),
) )
if output, err := SSH(host, "sh", "-c", cmd); err != nil { if output, err := SSH(host, "sh", "-c", cmd); err != nil {
return fmt.Errorf("failed to install cni plugin on %q: %v output: %q", host, err, output) return fmt.Errorf("failed to install cni plugin on %q: %v output: %q", host, err, output)