Merge pull request #592 from puppetlabs/maint-addressing_unless_typos

(MAINT) Addressing wrong type for unless execs
puppetlabs · Dec 5, 2022 · 7238ba0 · 7238ba0
2 parents 8ce4405 + 911bec3
commit 7238ba0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/manifests/kube_addons.pp b/manifests/kube_addons.pp
@@ -42,7 +42,7 @@
       if $cni_network_preinstall {
         $preinstall_command = ['kubectl', 'apply', '-f', $cni_network_preinstall]
         $preinstall_onlyif = ['kubectl', 'get', 'nodes']
-        $preinstall_unless = [["kubectl -n tigera-operator get deployments | egrep '^tigera-operator'"]]
+        $preinstall_unless = "kubectl -n tigera-operator get deployments | egrep '^tigera-operator'"
 
         exec { 'Install cni network (preinstall)':
           command     => $preinstall_command,
@@ -56,7 +56,7 @@
       $calico_installation_path = '/etc/kubernetes/calico-installation.yaml'
       $path_command = ['kubectl', 'apply', '-f', '/etc/kubernetes/calico-installation.yaml']
       $path_onlyif = ['kubectl', 'get', 'nodes']
-      $path_unless = [["kubectl -n calico-system get daemonset | egrep '^calico-node'"]]
+      $path_unless = "kubectl -n calico-system get daemonset | egrep '^calico-node'"
 
       file { $calico_installation_path:
         ensure  => 'present',
@@ -81,7 +81,7 @@
     } else {
       $provider_command = ['kubectl', 'apply', '-f', $cni_network_provider]
       $provider_onlyif = ['kubectl', 'get', 'nodes']
-      $provider_unless = [["kubectl -n kube-system get daemonset | egrep '(flannel|weave|calico-node|cilium)'"]]
+      $provider_unless = "kubectl -n kube-system get daemonset | egrep '(flannel|weave|calico-node|cilium)'"
 
       exec { 'Install cni network provider':
         command     => $provider_command,
@@ -98,7 +98,7 @@
 
   if $schedule_on_controller {
     $schedule_command = ['kubectl', 'taint', 'nodes', $node_name, 'node-role.kubernetes.io/master-']
-    $schedule_onlyif = ["kubectl describe nodes ${node_name} | tr -s ' ' | grep 'Taints: node-role.kubernetes.io/master:NoSchedule'"]
+    $schedule_onlyif = "kubectl describe nodes ${node_name} | tr -s ' ' | grep 'Taints: node-role.kubernetes.io/master:NoSchedule'"
 
     exec { 'schedule on controller':
       command => $schedule_command,

diff --git a/manifests/kubeadm_init.pp b/manifests/kubeadm_init.pp
@@ -16,8 +16,7 @@
   })
 
   $exec_init = ['kubeadm', 'init', $kubeadm_init_flags]
-  $unless_init = [["kubectl get nodes | grep ${node_name}"]]
-
+  $unless_init = "kubectl get nodes | grep ${node_name}"
   exec { 'kubeadm init':
     command     => $exec_init,
     environment => $env,

diff --git a/manifests/kubeadm_join.pp b/manifests/kubeadm_join.pp
@@ -44,7 +44,7 @@
   }
 
   $exec_join = ['kubeadm', 'join', $kubeadm_join_flags]
-  $unless_join = [["kubectl get nodes | grep ${node_name}"]]
+  $unless_join = "kubectl get nodes | grep ${node_name}"
 
   exec { 'kubeadm join':
     command     => $exec_join,