@@ -375,16 +375,18 @@ class Kubinator
375375 # (Idempotent) Install dashboard and helm
376376 #---------------------------------------------------------------------------
377377 Net ::SSH . start ( ips . first , @user , password :@pass , verify_host_key : :never ) { |ssh |
378- podready! ( 'etcd' , ssh :ssh )
379- podready! ( 'apiserver' , ssh :ssh )
380- podready! ( 'controller' , ssh :ssh )
381- podready! ( 'scheduler' , ssh :ssh )
378+ if ( all || init ) && ( dashboard || helm )
379+ podready! ( 'etcd' , ssh :ssh )
380+ podready! ( 'apiserver' , ssh :ssh )
381+ podready! ( 'controller' , ssh :ssh )
382+ podready! ( 'scheduler' , ssh :ssh )
383+ end
382384
383385 # Install dashboard
384386 if all or dashboard
385387 if not getpods ( pod :'dashboard' , ssh :ssh )
386388 puts ( "#{ ips . first } : Installing dashboard" . colorize ( :cyan ) )
387- url = "https://rawgit. com/kubernetes/dashboard/master/src/deploy/kubernetes-dashboard.yaml"
389+ url = "https://raw.githubusercontent. com/kubernetes/dashboard/master/src/deploy/recommended /kubernetes-dashboard.yaml"
388390 puts ( ssh . exec! ( "kubectl create -f #{ url } " ) )
389391 else
390392 puts ( "#{ ips . first } : Installing dashboard...skipped" . colorize ( :cyan ) )
@@ -401,6 +403,9 @@ class Kubinator
401403 puts ( "#{ ips . first } : Initializing/updating helm...skipped" . colorize ( :cyan ) )
402404 end
403405 end
406+
407+ podready! ( 'dashboard' , ssh :ssh ) if all or dashboard
408+ podready! ( 'tiller' , ssh :ssh ) if all or helm
404409 }
405410
406411 puts ( "Cluster creation took: #{ Time . now - elapse } sec" . colorize ( :light_yellow ) )
0 commit comments