Add a Kine fix when rke2 restart apiserver

Signed-off-by: Vitor Savian <[email protected]> Remove unnecessary socket code Signed-off-by: Vitor Savian <[email protected]>
rancher · May 29, 2024 · b7e5e8a · b7e5e8a
1 parent 99f9cc6
commit b7e5e8a
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/pkg/podexecutor/staticpod.go b/pkg/podexecutor/staticpod.go
@@ -317,17 +317,16 @@ func (s *StaticPodConfig) APIServer(_ context.Context, etcdReady <-chan struct{}
 		files = append(files, etcdNameFile(s.DataDir))
 	}
 
-	sockets := []string{}
-	if s.ExternalDatabase {
-		sockets = append(sockets, kineSock(s.DataDir))
-	}
-
 	dirs := onlyExisting(ssldirs)
 	if auditLogFile != "" && auditLogFile != "-" {
 		dirs = append(dirs, filepath.Dir(auditLogFile))
 		excludeFiles = append(excludeFiles, auditLogFile)
 	}
 
+	// Need to mount the entire server directory so that any files recreated in this directory
+	// after the pod has been started are not masked by a stale mount
+	dirs = append(dirs, filepath.Join(s.DataDir, "server"))
+
 	apiServerArgs := staticpod.Args{
 		Command:       "kube-apiserver",
 		Args:          args,
@@ -341,7 +340,6 @@ func (s *StaticPodConfig) APIServer(_ context.Context, etcdReady <-chan struct{}
 		ExtraEnv:      s.ControlPlaneEnv.KubeAPIServer,
 		ExtraMounts:   s.ControlPlaneMounts.KubeAPIServer,
 		ProbeConfs:    s.ControlPlaneProbeConfs.KubeAPIServer,
-		Sockets:       sockets,
 		Files:         files,
 		ExcludeFiles:  excludeFiles,
 		HealthExec: []string{
@@ -385,11 +383,6 @@ func (s *StaticPodConfig) Scheduler(_ context.Context, apiReady <-chan struct{},
 		files = append(files, etcdNameFile(s.DataDir))
 	}
 
-	sockets := []string{}
-	if s.ExternalDatabase {
-		sockets = append(sockets, kineSock(s.DataDir))
-	}
-
 	args = append(permitPortSharingFlag, args...)
 	return after(apiReady, func() error {
 		return staticpod.Run(s.ManifestsDir, staticpod.Args{
@@ -407,7 +400,6 @@ func (s *StaticPodConfig) Scheduler(_ context.Context, apiReady <-chan struct{},
 			ExtraMounts:   s.ControlPlaneMounts.KubeScheduler,
 			ProbeConfs:    s.ControlPlaneProbeConfs.KubeScheduler,
 			Files:         files,
-			Sockets:       sockets,
 		})
 	})
 }
@@ -457,11 +449,6 @@ func (s *StaticPodConfig) ControllerManager(_ context.Context, apiReady <-chan s
 		files = append(files, etcdNameFile(s.DataDir))
 	}
 
-	sockets := []string{}
-	if s.ExternalDatabase {
-		sockets = append(sockets, kineSock(s.DataDir))
-	}
-
 	return after(apiReady, func() error {
 		extraArgs := []string{
 			"--flex-volume-plugin-dir=/var/lib/kubelet/volumeplugins",
@@ -484,7 +471,6 @@ func (s *StaticPodConfig) ControllerManager(_ context.Context, apiReady <-chan s
 			ExtraMounts:   s.ControlPlaneMounts.KubeControllerManager,
 			ProbeConfs:    s.ControlPlaneProbeConfs.KubeControllerManager,
 			Files:         files,
-			Sockets:       sockets,
 		})
 	})
 }