Allow the BootstrapClient task to run after Protokube

upup/pkg/fi/nodeup/nodetasks/bootstrap_client.go

@@ -59,7 +59,14 @@ var _ fi.HasName = &BootstrapClient{}
 var _ fi.HasDependencies = &BootstrapClient{}
 
 func (b *BootstrapClient) GetDependencies(tasks map[string]fi.Task) []fi.Task {
-	return nil
+	// BootstrapClient depends on the protokube service to ensure gossip DNS
+	var deps []fi.Task
+	for _, v := range tasks {
+		if svc, ok := v.(*Service); ok && svc.Name == protokubeService {
+			deps = append(deps, v)
+		}
+	}
+	return deps
 }
 
 func (b *BootstrapClient) GetName() *string {

upup/pkg/fi/nodeup/nodetasks/load_image.go

@@ -33,11 +33,6 @@ import (
 	"k8s.io/kops/util/pkg/hashing"
 )
 
-const (
-	containerdService = "containerd.service"
-	dockerService     = "docker.service"
-)
-
 // LoadImageTask is responsible for downloading a docker image
 type LoadImageTask struct {
 	Name    string

upup/pkg/fi/nodeup/nodetasks/service.go

@@ -43,6 +43,11 @@ const (
 	flatcarSystemdSystemPath = "/etc/systemd/system"
 
 	containerosSystemdSystemPath = "/etc/systemd/system"
+
+	containerdService = "containerd.service"
+	dockerService     = "docker.service"
+	kubeletService    = "kubelet.service"
+	protokubeService  = "protokube.service"
 )
 
 type Service struct {
@@ -67,11 +72,22 @@ func (p *Service) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 		// LoadImageTask or IssueCert. If there are any LoadImageTasks (e.g. we're
 		// launching a custom Kubernetes build), they all depend on
 		// the "docker.service" Service task.
-		switch v.(type) {
-		case *File, *Package, *UpdatePackages, *UserTask, *GroupTask, *Chattr, *BindMount, *Archive:
+		switch v := v.(type) {
+		case *Package, *UpdatePackages, *UserTask, *GroupTask, *Chattr, *BindMount, *Archive:
 			deps = append(deps, v)
-		case *Service, *LoadImageTask, *IssueCert:
+		case *Service, *LoadImageTask, *IssueCert, *BootstrapClient:
 			// ignore
+		case *File:
+			// Skip adding kubeconfig files as dependencies for services other than kubelet
+			if strings.HasSuffix(v.Path, "/kubeconfig") && p.Name != kubeletService {
+				continue
+			}
+			deps = append(deps, v)
+		case *KubeConfig:
+			// Only add kubeconfigs as dependencies for kubelet
+			if p.Name == kubeletService {
+				deps = append(deps, v)
+			}
 		default:
 			klog.Warningf("Unhandled type %T in Service::GetDependencies: %v", v, v)
 			deps = append(deps, v)