Browse Source

Weave: add extra_args for weave-npc (#8140)

* add weave_npc_extra_args in template

* add defaults weave_npc_extra_args

* add sample for weave_npc_extra_args
pull/8145/head
brainfair 2 years ago
committed by GitHub
parent
commit
465ffa3c9f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
  1. 3
      inventory/sample/group_vars/k8s_cluster/k8s-net-weave.yml
  2. 3
      roles/network_plugin/weave/defaults/main.yml
  3. 4
      roles/network_plugin/weave/templates/weave-net.yml.j2

3
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: ~

3
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: ~

4
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:

Loading…
Cancel
Save