Merge pull request openshift#704 from runcom/fix-mcd-logs

Small fixes + remove not needed mounts

manifests/machineconfigdaemon/daemonset.yaml

@@ -27,20 +27,6 @@ spec:
         volumeMounts:
           - mountPath: /rootfs
             name: rootfs
-          # For now, we chroot into /rootfs, so we're not really making use of
-          # these mount points below (it works transparently right now because
-          # the mounted path is the same as the host path). They're mostly kept
-          # for documentation purposes, and in case we stop chroot'ing.
-          - mountPath: /var/run/dbus
-            name: var-run-dbus
-          - mountPath: /run/systemd
-            name: run-systemd
-          - mountPath: /etc/ssl/certs
-            name: etc-ssl-certs
-            readOnly: true
-          - mountPath: /etc/machine-config-daemon
-            name: etc-mcd
-            readOnly: true
         env:
           - name: NODE_NAME
             valueFrom:
@@ -64,15 +50,3 @@ spec:
         - name: rootfs
           hostPath:
             path: /
-        - name: var-run-dbus
-          hostPath:
-            path: /var/run/dbus
-        - name: run-systemd
-          hostPath:
-            path: /run/systemd
-        - name: etc-ssl-certs
-          hostPath:
-            path: /etc/ssl/certs
-        - name: etc-mcd
-          hostPath:
-            path: /etc/machine-config-daemon

pkg/daemon/daemon.go

@@ -268,8 +268,6 @@ func NewClusterDrivenDaemon(
 	eventBroadcaster.StartRecordingToSink(&clientsetcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
 	dn.recorder = eventBroadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{Component: "machineconfigdaemon", Host: nodeName})
 
-	dn.logSystem("Starting to manage node: %s", nodeName)
-
 	go dn.runLoginMonitor(dn.stopCh, dn.exitCh)
 
 	nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
@@ -497,6 +495,8 @@ func (dn *Daemon) InstallSignalHandler(signaled chan struct{}) {
 // responsible for triggering callbacks to handle updates. Successful
 // updates shouldn't return, and should just reboot the node.
 func (dn *Daemon) Run(stopCh, signaled <-chan struct{}, exitCh <-chan error) error {
+	dn.logSystem("Starting to manage node: %s", dn.name)
+
 	if dn.kubeletHealthzEnabled {
 		glog.Info("Enabling Kubelet Healthz Monitor")
 		go dn.runKubeletHealthzMonitor(stopCh, dn.exitCh)
@@ -856,7 +856,7 @@ func (dn *Daemon) CheckStateOnBoot() error {
 		return err
 	}
 	// write a file with current fingerprint overriding the previous
-	if err := writeFileAtomicallyWithDefaults(currentConfigPath, mcJSON); err != nil {
+	if err := writeFileAtomicallyWithDefaults(dn.currentConfigPath, mcJSON); err != nil {
 		return err
 	}
 

pkg/daemon/update.go

@@ -719,7 +719,7 @@ func (dn *Daemon) logSystem(format string, a ...interface{}) {
 
 	go func() {
 		defer stdin.Close()
-		io.WriteString(stdin, "machine-config-daemon: ")
+		io.WriteString(stdin, fmt.Sprintf("machine-config-daemon[%d]: ", os.Getpid()))
 		io.WriteString(stdin, message)
 	}()
 	err = logger.Run()