Add D-Bus installation to restarter logic

Signed-off-by: Kate Goldenring <[email protected]>

Author: kate-goldenring

Programs/temp/rcm-kubeconfig

@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURCVENDQWUyZ0F3SUJBZ0lJVXREaXowLzRMcVl3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBMU1EWXhPREl4TlRsYUZ3MHpOVEExTURReE9ESTJOVGxhTUJVeApFekFSQmdOVkJBTVRDbXQxWW1WeWJtVjBaWE13Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLCkFvSUJBUURCWlBsL2IrQk03ZTYyaVRWbDVMZ2RTOVRvSXpsa1RuRU1BdmV3K0Y2RVM5cll0K1FFcXZuR2hxdUMKZEdFMExYVVd0NTFOTU9oelptWUV2OW90TCtFcis3WEZzWllSdG8yNlVBS1dlRFk4ak1aM1RYZXFsckoxYWNFdQpsMG5Ud2xpdktyM2VGaW9PL3NybnBKQWNna1ZmWlpFR2JjaVAwb3IrcWxNNHpRc0dNVHh0R2VjRUVxakgxWUtkCnN0WVlldHFUY3ljV2dma2YxUDF4SXhIaWpjMTB6QjVqYlBub1dqbW84aFoySTNOdFZleUlsR1c3d1VJYytaMkIKT2duV2VYb0haM2g2eVRtb0N3SUpGWCt0b3dyT1ZRNndOcUJYV05RcWdUMU9CNlczUThRMTVoSHczU3lXRDJNSwprazNRc1NiYTdScFJsRE41c21hckFXNDNqNWZ6QWdNQkFBR2pXVEJYTUE0R0ExVWREd0VCL3dRRUF3SUNwREFQCkJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJST3hERWc1QWkrMGdRRDB5azNPSjJ4bzVwaEtUQVYKQmdOVkhSRUVEakFNZ2dwcmRXSmxjbTVsZEdWek1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQmlIcEVtblcwMwpMYnRMQks5S0UwSFJ1MWNWaklJSUsreERDTWtCLzJsaitFUDFVemxDV0JITitoMUNGdWo3UDBxUDJ0UnNUcFNLClZvNURVZWt2OVNhNEF5cTVaZFl1cmJ5bzBKOWdjV1ZvcWhyalczZ29ZWHlWSlVDb3FkdU9OR0tMNmNtVnVUSXMKVk9rc3AwLzNqMWVnNUNGUnJScFdIVGlIcFkxa1V6K1A2MFhVcUZVd1BsemE3akFKS0o4dmtmYnc1eTZNZzZIcQp1SktMVEZFbStFeG9hdkxiWW56UWJvRm5FRlcwcHFMYmdMTzZCVW8vU1ZOTlJPNUpBdHY0NHFxYm5KNEZVNGJsClhibmN4K3lQYUN4U1JuNnd3MmlKZ3VxL3ZsenM1b2lYeXlpVkQxbUgwbFNLNHoydXY1aUtUcTJucDVpUjZaM08KRXFGYUk4Zi9zWTQvCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    server: https://127.0.0.1:58729
+  name: kind-rcm-testing
+contexts:
+- context:
+    cluster: kind-rcm-testing
+    user: kind-rcm-testing
+  name: kind-rcm-testing
+current-context: kind-rcm-testing
+kind: Config
+preferences: {}
+users:
+- name: kind-rcm-testing
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLVENDQWhHZ0F3SUJBZ0lJUUFtZ3hvYVQ1dXN3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TlRBMU1EWXhPREl4TlRsYUZ3MHlOakExTURZeE9ESTNNREZhTUR3eApIekFkQmdOVkJBb1RGbXQxWW1WaFpHMDZZMngxYzNSbGNpMWhaRzFwYm5NeEdUQVhCZ05WQkFNVEVHdDFZbVZ5CmJtVjBaWE10WVdSdGFXNHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEQVhSKzEKMjNjNUszbzJ5T2FFOXNkRlFZWGJDWTBPM0VlQmdzU0VuNzc2THdDczczZDZVeTkrUXJlR2hKZnJ0WHpQSEtZdQpWbVNBZHJncHV2U0hkRS9hbXR5ZG1aR244bktmQ3Jua29raVBHcWRnMk9rTEtWb256M2hURFpXS3V5Q1dzM0xyCkUza0JqMm0reDRNT3RTdFVJSnU2V25sVENRWXJhaG5zaUMvdEcvMEdtZzJUUDJucnl5ZG5XQUlydWJLbWUzUHEKdzJiM3RXdWUzL1VtZWZtR0RBdkszb1A5c0FpUmZwazdIQlRMRlhoWFdGV05NUzVKUGxuQ081TC9ieUtTUjZqcgp2eGdEOHpNaGJ0cUZ6elUzOVlMcU13dVhTTForNzdtSFNWUkY3cS8wRy9SZWcwWE5JMXpIaDVKQzdIQ1IrSk9PCmhXQk0zbm96ZTdaalRUVTVBZ01CQUFHalZqQlVNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUsKQmdnckJnRUZCUWNEQWpBTUJnTlZIUk1CQWY4RUFqQUFNQjhHQTFVZEl3UVlNQmFBRkU3RU1TRGtDTDdTQkFQVApLVGM0bmJHam1tRXBNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUFqN0xkM3BMdEx4MkNIbUFQWXdjUUZnNmF2CkJGY2tvWUcvb2ROZE41MFg4SXBVM3oyeEczMC9vaC9sRlNnbU5aKzJPWXZET2RLZG01MFZBVjJ2MGFyRmtWQS8KVCszSTVSRjcyL3dYci9peVIvejdhandBVkNHaElXekxlSVk0bi9YczZpZzFrNldhZm5mdjQvalZvYmFaekFCNgpnZFZUdStIbmR3emVNYklrUC83cTEvNG5RRFMyWXpLNjZtWmhGR1AxbElIZEN3Zm11S2xYTnhtRW1sa1pjM0V3ClZRZ25jeWlUL3NVK3ZaajlvajZLUVNqSkR2SG9yZXh1b2xLTHRSZGg1Y25KUGxXR3hFMkxESFRXN3VvdCtUV20KTS9uaGgwdHJUOG5UeGtYaHFSMmpPTFFRVVJ1WXJESWtEKzNoSXBDbDlPakVDNVBMczcvQ3Z6dW9yT3I0Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBd0YwZnRkdDNPU3Q2TnNqbWhQYkhSVUdGMndtTkR0eEhnWUxFaEorKytpOEFyTzkzCmVsTXZma0szaG9TWDY3Vjh6eHltTGxaa2dIYTRLYnIwaDNSUDJwcmNuWm1ScC9KeW53cTU1S0pJanhxbllOanAKQ3lsYUo4OTRVdzJWaXJzZ2xyTnk2eE41QVk5cHZzZUREclVyVkNDYnVscDVVd2tHSzJvWjdJZ3Y3UnY5QnBvTgprejlwNjhzbloxZ0NLN215cG50ejZzTm05N1ZybnQvMUpubjVoZ3dMeXQ2RC9iQUlrWDZaT3h3VXl4VjRWMWhWCmpURXVTVDVad2p1Uy8yOGlra2VvNjc4WUEvTXpJVzdhaGM4MU4vV0M2ak1MbDBpMmZ1KzVoMGxVUmU2djlCdjAKWG9ORnpTTmN4NGVTUXV4d2tmaVRqb1ZnVE41Nk0zdTJZMDAxT1FJREFRQUJBb0lCQVFDbDNXWWpTN293YkdHego3V1IvRDc1ZzVBK0QvMmRHZ2YrU0YyeFZvdHhzSXEwbGNGSUlBc1EzelZVcnd4YXZva3ljMU9vaG1GS09SaytqCmc5V25HazVrZ3hWcE91cFI4d2FNUmhabG90eUhzQWJVeGhPamtTTndvajd3OWd5VWs2ZVU2ZVJUOS9WbHVBQUoKQlVUbklLWGNvMFZEMlJFMTNOa2FCQ0dZUnhGMEV5ZXptbXh2ZEd5YmI5cW5BWHdTVW9tbS9Ud2JJMCtOdy92Tgp1d2YyN0JjWlVFUEJHaXB4TXpEMWtqUk0zRk44TUVuZTBNWjR1SUJqUkF0TWlGOU1NYVllTEdBVmZXc3NCUXc4Ci9PZm80SnFjeVhPMkQyZ3NNQS9wWHZ6aW1GSTBUK2s1czBseEpRNG9WdFUwN3haUGZQWEp6RkpOanQ1c1pkMUQKb21qMGpwNVZBb0dCQU5GMEh2NU5ZdUdOSFhIeFc2ajlpZ1JxenZCMzBwZTE1cHFxR05pVnkyTlNMcEpla2QraApuVXFBRFRocU8xQmVJSmtPNGw1ZFA2UXlIUkU0Q1Vma2c3REsxUzJXWitzcEJ5YmY0RjRDTUJlZTg0WG9ZMERPCjJ4VGVoaEJBbTZvZzZUTzFUYjR5VDlvVmg3SkgrTlNlbkNYS3cva3Bvc01SZDFZQnpsYUFERHZMQW9HQkFPc2MKd2N0NmJUWGxzUW5FL2lJSHJrNUhyTTY0MG90Y29Rbzg2eEw0WmJhSFZWZ3UxQ2w3NWw5WW54ZnlVQjFpUXZwZQpjOGF5bjQ4NmpOTVBDTE93SDdEQUdmYkpzWGdkUDV5YWMvd2d0dnFRUUNDazdXb1Uvak5HMnNvZUpsbjRTZ2pnCkN6NFZ4aHZrYy96U3RGbU9rbDFVbzdLd3ZBUTdDekFYdjJBSFBucUxBb0dCQU1xVGJicDA3RExMd2ZQSEJPalAKdHVJSXozYmgzT3RnUWRYS3Q5Y2FJYWxBL2N3UTdUTUdZMU4vdjhtVmJTS1F0eVJ4c2R5a2dYM3ovZ3IrVUhPWQovd2xKVTU4UXZoZENDaW0rRTRtNHdmekdmaTlBRUdiSTZqa244eS9hM1BOUmUxckllcFYrb1o2Q2ZraWV0WG9tCm9VMG43QnlhK1ZHREhoRXdFL216UktHN0FvR0JBSTREaHNPRHBhZmluL2RJdUVDUjV5VjlnZEkwTFdqa2dKbVEKaG1XbENMc2lMOWplSUdVV1krYS92d2xWNGpKOWdmdDlSZTJGUTMvZVcrVzR0UWJrb1orL3lXOGFFVXArVUVnbAp1MTFWM1hDbjVUUlNxdDFpNU5EUVFhUElabDM5N2FwQ3VrZThHemdKM0UyZ2NET1FQTFNIUllIUDR5R2pFSFR5ClF6U2I2NDlWQW9HQVE1cDFlZzNNU2hJKzZtVTRva1lQNVU4aWkxTktQZ09tODNqemZ2NzFPZGNPdlVCbDVjVjYKcW5MZkpQMllDeVpXejg2WmczaTlwcWxQekhaWGlSc1pZYmZOU3FzTEhVK2gwSkJDd0VId2JMM3FtdmVHM1FyaApIQjJzTSt3VmYvRitScVlsWWVCSm1EQVpuc1prdk16QkJOaFBMNWtOYzBZKzBUcjJ0aXNOQ2R3PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=

cmd/node-installer/install.go

@@ -116,14 +116,6 @@ func RunInstall(config Config, rootFs, hostFs afero.Fs, restarter containerd.Res
 		return nil
 	}
 
-	// Ensure D-Bus is installed and running if using systemd
-	if containerd.UsesSystemd() {
-		err = containerd.InstallDbus()
-		if err != nil {
-			return fmt.Errorf("failed to install D-Bus: %w", err)
-		}
-	}
-
 	slog.Info("restarting containerd")
 	err = containerdConfig.RestartRuntime()
 	if err != nil {

internal/containerd/install_dbus.go

@@ -29,7 +29,7 @@ func InstallDbus() error {
 		slog.Info("D-Bus is already installed and running")
 		return nil
 	}
-	slog.Info("Installing D-Bus")
+	slog.Info("installing D-Bus")
 	whichApt := nsenterCmd("which", "apt-get")
 	whichYum := nsenterCmd("which", "yum")
 	whichDnf := nsenterCmd("which", "dnf")
@@ -63,7 +63,7 @@ func InstallDbus() error {
 		return nil
 	}
 
-	slog.Info("Restarting D-Bus")
+	slog.Info("restarting D-Bus")
 	cmd = nsenterCmd("systemctl", "restart", "dbus")
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to restart D-Bus: %w", err)

internal/containerd/restart_unix.go

@@ -36,6 +36,15 @@ func NewRestarter() Restarter {
 }
 
 func (c restarter) Restart() error {
+	// To make sure any runtime options are applied, ensure D-Bus is
+	// installed and running if using systemd
+	if UsesSystemd() {
+		err := InstallDbus()
+		if err != nil {
+			return fmt.Errorf("failed to install D-Bus: %w", err)
+		}
+	}
+
 	pid, err := getPid()
 	if err != nil {
 		return err