diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-net-weave.yml b/inventory/sample/group_vars/k8s_cluster/k8s-net-weave.yml index ed6c3c08e6d9e864a9f60bd3fe4907c5089c25a4..269a77c93f8ab51dbbee5bd8ca2f5206a22992af 100644 --- a/inventory/sample/group_vars/k8s_cluster/k8s-net-weave.yml +++ b/inventory/sample/group_vars/k8s_cluster/k8s-net-weave.yml @@ -59,3 +59,6 @@ # Extra variables that passing to launch.sh, useful for enabling seed mode, see # https://www.weave.works/docs/net/latest/tasks/ipam/ipam/ # weave_extra_args: ~ + +# Extra variables for weave_npc that passing to launch.sh, useful for change log level, ex --log-level=error +# weave_npc_extra_args: ~ diff --git a/roles/network_plugin/weave/defaults/main.yml b/roles/network_plugin/weave/defaults/main.yml index b1c79a6db8c956892d344f3dc9bd25483a2378a4..47469ae4c83c91db1bcc50a7ef9356693d5af7e4 100644 --- a/roles/network_plugin/weave/defaults/main.yml +++ b/roles/network_plugin/weave/defaults/main.yml @@ -59,3 +59,6 @@ weave_iptables_backend: ~ # Extra variables that passing to launch.sh, useful for enabling seed mode, see # https://www.weave.works/docs/net/latest/tasks/ipam/ipam/ weave_extra_args: ~ + +# Extra variables for weave_npc that passing to launch.sh, useful for change log level, ex --log-level=error +weave_npc_extra_args: ~ diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2 index d32cfe9cf916d89ec70d333735e551d0a7031f75..84c4fa0dad81a8e961bccf7d165248b96164a561 100644 --- a/roles/network_plugin/weave/templates/weave-net.yml.j2 +++ b/roles/network_plugin/weave/templates/weave-net.yml.j2 @@ -230,6 +230,10 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName +{% if weave_npc_extra_args %} + - name: EXTRA_ARGS + value: "{{ weave_npc_extra_args }}" +{% endif %} image: {{ weave_npc_image_repo }}:{{ weave_npc_image_tag }} imagePullPolicy: {{ k8s_image_pull_policy }} resources: