From 5c7eef70b417b6df7dcd573963592cca6ab7f6a4 Mon Sep 17 00:00:00 2001
From: Egor <iam@aylium.net>
Date: Fri, 9 Nov 2018 19:15:27 +0300
Subject: [PATCH] Fix kube-router annotations: add conditions (#3670)
---
roles/network_plugin/kube-router/tasks/annotate.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/network_plugin/kube-router/tasks/annotate.yml b/roles/network_plugin/kube-router/tasks/annotate.yml
index 18880e123..a6a481e4c 100644
--- a/roles/network_plugin/kube-router/tasks/annotate.yml
+++ b/roles/network_plugin/kube-router/tasks/annotate.yml
@@ -4,18 +4,18 @@
with_items:
- "{{ kube_router_annotations_master }}"
delegate_to: "{{groups['kube-master'][0]}}"
- when: kube_router_annotations_master is defined
+ when: kube_router_annotations_master is defined and inventory_hostname in groups['kube-master']
- name: kube-router | Add annotations on kube-node
command: "{{bin_dir}}/kubectl annotate --overwrite node {{ ansible_hostname }} {{ item }}"
with_items:
- "{{ kube_router_annotations_node }}"
delegate_to: "{{groups['kube-master'][0]}}"
- when: kube_router_annotations_node is defined
+ when: kube_router_annotations_node is defined and inventory_hostname in groups['kube-node']
- name: kube-router | Add common annotations on all servers
command: "{{bin_dir}}/kubectl annotate --overwrite node {{ ansible_hostname }} {{ item }}"
with_items:
- "{{ kube_router_annotations_all }}"
delegate_to: "{{groups['kube-master'][0]}}"
- when: kube_router_annotations_all is defined
\ No newline at end of file
+ when: kube_router_annotations_all is defined and inventory_hostname in groups['all']
\ No newline at end of file
--
GitLab