Skip to content

Commit 4bdf2a8

Browse files
committed
(MAINT) Remove safe_node_name
1 parent fe6c101 commit 4bdf2a8

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

manifests/kube_addons.pp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@
7777
}
7878

7979
if $schedule_on_controller {
80-
$safe_node_name = shell_escape($node_name)
8180
exec { 'schedule on controller':
82-
command => "kubectl taint nodes ${safe_node_name} node-role.kubernetes.io/master-",
83-
onlyif => "kubectl describe nodes ${safe_node_name} | tr -s ' ' | grep 'Taints: node-role.kubernetes.io/master:NoSchedule'",
81+
command => "kubectl taint nodes ${node_name} node-role.kubernetes.io/master-",
82+
onlyif => "kubectl describe nodes ${node_name} | tr -s ' ' | grep 'Taints: node-role.kubernetes.io/master:NoSchedule'",
8483
}
8584
}
8685

manifests/kubeadm_init.pp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
skip_phases => $skip_phases,
1616
})
1717

18-
$safe_node_name = shell_escape($node_name)
19-
2018
exec { 'kubeadm init':
2119
command => "kubeadm init ${kubeadm_init_flags}",
2220
environment => $env,
2321
path => $path,
2422
logoutput => true,
2523
timeout => 0,
26-
unless => "kubectl get nodes | grep ${safe_node_name}",
24+
unless => "kubectl get nodes | grep ${node_name}",
2725
}
2826

2927
# This prevents a known race condition https://github.com/kubernetes/kubernetes/issues/66689

0 commit comments

Comments
 (0)