Skip to content

Commit 3397fb7

Browse files
committed
Revert "tests: split kubectl download task into multiple with retries (kubernetes#3059)"
This reverts commit ebe2fa6.
1 parent ebe2fa6 commit 3397fb7

File tree

1 file changed

+3
-26
lines changed
  • tests/playbooks/roles/install-k3s/tasks

1 file changed

+3
-26
lines changed

tests/playbooks/roles/install-k3s/tasks/main.yaml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -154,39 +154,16 @@
154154
retries: 100
155155
delay: 5
156156

157-
- name: Prepare kubeconfig file
157+
- name: Prepare kubectl and kubeconfig file
158158
shell:
159159
executable: /bin/bash
160160
cmd: |
161161
set -ex
162162
163163
mkdir -p {{ ansible_user_dir }}/.kube
164164
scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i {{ ansible_user_dir }}/.ssh/id_rsa ubuntu@{{ k3s_fip }}:/etc/rancher/k3s/k3s.yaml {{ ansible_user_dir }}/.kube/config
165-
166-
- name: Get latest kubectl version
167-
uri:
168-
url: https://dl.k8s.io/release/stable.txt
169-
return_content: yes
170-
register: kubectl_version
171-
retries: 5
172-
delay: 10
173-
until: kubectl_version.status == 200
174-
175-
- name: Download kubectl binary
176-
get_url:
177-
url: "https://dl.k8s.io/release/{{ kubectl_version.content | trim }}/bin/linux/amd64/kubectl"
178-
dest: /usr/local/bin/kubectl
179-
mode: '0755'
180-
become: true
181-
retries: 5
182-
delay: 10
183-
184-
- name: Set kubectl cluster config
185-
shell:
186-
executable: /bin/bash
187-
cmd: |
188-
set -ex
189-
165+
curl -sLO# https://dl.k8s.io/release/$(curl -Ls https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
166+
chmod +x ./kubectl; sudo mv ./kubectl /usr/local/bin/kubectl
190167
kubectl config set-cluster default --server=https://{{ k3s_fip }}:6443 --kubeconfig {{ ansible_user_dir }}/.kube/config
191168
192169
- name: Wait for k8s node ready

0 commit comments

Comments
 (0)