Skip to content

Commit 20a8e74

Browse files
committed
Use default flannel images for tests
1 parent 5a90a9f commit 20a8e74

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

inventory/sample/group_vars/k8s_cluster/k8s-net-flannel.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# see roles/network_plugin/flannel/defaults/main.yml
23

34
## interface that should be used for flannel operations

roles/network_plugin/flannel/defaults/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ flannel_cpu_limit: 300m
2828
flannel_memory_requests: 64M
2929
flannel_cpu_requests: 150m
3030

31+
#list of architecture specific Daemonsets to be created, only amd64 by default.
3132
flannel_daemonset_arch_list:
3233
- amd64
3334
# - arm64

tests/common_vars.yml

-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ netcheck_agent_image_repo: "{{ quay_image_repo }}/kubespray/k8s-netchecker-agent
3131
netcheck_server_image_repo: "{{ quay_image_repo }}/kubespray/k8s-netchecker-server"
3232

3333
nginx_image_repo: "{{ quay_image_repo }}/kubespray/nginx"
34-
35-
flannel_image_repo: "{{ quay_image_repo }}/kubespray/flannel"
36-
flannel_init_image_repo: "{{ quay_image_repo }}/kubespray/flannel-cni-plugin"

0 commit comments

Comments
 (0)