Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b236e3b

Browse files
committedMar 27, 2025·
Use default flannel images for tests
1 parent 5a90a9f commit b236e3b

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed
 

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

Lines changed: 2 additions & 1 deletion
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
@@ -23,4 +24,4 @@ flannel_daemonset_arch_list:
2324
# - arm64
2425
# - arm
2526
# - ppc64le
26-
# - s390x
27+
# - s390x

‎roles/network_plugin/flannel/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ 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
3435
# - arm
3536
# - ppc64le
36-
# - s390x
37+
# - s390x

‎roles/network_plugin/flannel/templates/cni-flannel-rbac.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ roleRef:
5858
subjects:
5959
- kind: ServiceAccount
6060
name: flannel
61-
namespace: kube-system
61+
namespace: kube-system

‎roles/network_plugin/flannel/templates/cni-flannel.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
cpu: {{ flannel_cpu_requests }}
8787
memory: {{ flannel_memory_requests }}
8888
command: ["/opt/bin/flanneld"]
89-
args:
89+
args:
9090
- --ip-masq
9191
- --kube-subnet-mgr
9292
{% if flannel_interface is defined %}
@@ -180,4 +180,4 @@ spec:
180180
rollingUpdate:
181181
maxUnavailable: {{ serial | default('20%') }}
182182
type: RollingUpdate
183-
{% endfor %}
183+
{% endfor %}

0 commit comments

Comments
 (0)
Please sign in to comment.