From ffc38a22370a06e96f4e4f4f5f3993311c79ab4f Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Fri, 30 Apr 2021 02:39:57 +0200
Subject: [PATCH] Fix busybox for tests to reduce dockerhub calls (#7571)
---
README.md | 2 +-
roles/download/defaults/main.yml | 9 ---------
tests/testcases/030_check-network.yml | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 27d13aa80..9ff07bbc5 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [cri-o](http://cri-o.io/) v1.20 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
- Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.9.1
- - [calico](https://github.com/projectcalico/calico) v3.17.3
+ - [calico](https://github.com/projectcalico/calico) v3.17.4
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- [cilium](https://github.com/cilium/cilium) v1.8.8
- [flanneld](https://github.com/coreos/flannel) v0.13.0
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 066ee3e4a..209422db9 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -458,8 +458,6 @@ nodelocaldns_image_tag: "{{ nodelocaldns_version }}"
dnsautoscaler_version: 1.8.3
dnsautoscaler_image_repo: "{{ kube_image_repo }}/cpa/cluster-proportional-autoscaler-{{ image_arch }}"
dnsautoscaler_image_tag: "{{ dnsautoscaler_version }}"
-test_image_repo: "{{ kube_image_repo }}/busybox"
-test_image_tag: latest
registry_image_repo: "{{ docker_image_repo }}/library/registry"
registry_image_tag: "2.7.1"
@@ -900,13 +898,6 @@ downloads:
groups:
- kube_control_plane
- testbox:
- enabled: false
- container: true
- repo: "{{ test_image_repo }}"
- tag: "{{ test_image_tag }}"
- sha256: "{{ testbox_digest_checksum|default(None) }}"
-
helm:
enabled: "{{ helm_enabled }}"
file: true
diff --git a/tests/testcases/030_check-network.yml b/tests/testcases/030_check-network.yml
index 5b18d6a8b..d669d4906 100644
--- a/tests/testcases/030_check-network.yml
+++ b/tests/testcases/030_check-network.yml
@@ -1,7 +1,7 @@
---
- hosts: kube_control_plane[0]
vars:
- test_image_repo: busybox
+ test_image_repo: k8s.gcr.io/busybox
test_image_tag: latest
tasks:
--
GitLab