From 538f4dad9ded5e6e5cd1187971e68b648e2bbae5 Mon Sep 17 00:00:00 2001
From: jlacoline <jean.lacoline@gmail.com>
Date: Mon, 20 Jan 2020 20:43:36 +0100
Subject: [PATCH] tag role kubernetes/node-label in playbooks (#5560)

---
 cluster.yml         | 2 +-
 scale.yml           | 2 +-
 upgrade-cluster.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster.yml b/cluster.yml
index 1d2f15bbf..b2bc4b54c 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -78,7 +78,7 @@
     - { role: kubespray-defaults}
     - { role: kubernetes/kubeadm, tags: kubeadm}
     - { role: network_plugin, tags: network }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
 
 - hosts: calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
diff --git a/scale.yml b/scale.yml
index 8b53b04f1..27c32e907 100644
--- a/scale.yml
+++ b/scale.yml
@@ -46,5 +46,5 @@
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/kubeadm, tags: kubeadm }
     - { role: network_plugin, tags: network }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
   environment: "{{ proxy_env }}"
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index b3d17f530..a20b1ec88 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -72,7 +72,7 @@
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/master, tags: master, upgrade_cluster_setup: true }
     - { role: kubernetes/client, tags: client }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
     - { role: kubernetes-apps/cluster_roles, tags: cluster-roles }
     - { role: upgrade/post-upgrade, tags: post-upgrade }
   environment: "{{ proxy_env }}"
@@ -96,7 +96,7 @@
     - { role: upgrade/pre-upgrade, tags: pre-upgrade }
     - { role: kubernetes/node, tags: node }
     - { role: kubernetes/kubeadm, tags: kubeadm }
-    - { role: kubernetes/node-label }
+    - { role: kubernetes/node-label, tags: node-label }
     - { role: upgrade/post-upgrade, tags: post-upgrade }
   environment: "{{ proxy_env }}"
 
-- 
GitLab