diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go index bcaa1fb40c..18d50ee257 100644 --- a/pkg/daemon/daemon.go +++ b/pkg/daemon/daemon.go @@ -57,9 +57,6 @@ type Daemon struct { // os the operating system the MCD is running on os OperatingSystem - // IgnitionVersion is the version of the installed Ignition binary on the system - IgnitionVersion string - // mock is set if we're running as non-root, probably under unit tests mock bool @@ -128,8 +125,6 @@ type Daemon struct { } const ( - // pathIgnition is the path where the ignition binary resides - pathIgnition = "/usr/lib/dracut/modules.d/30ignition/ignition" // pathSystemd is the path systemd modifiable units, services, etc.. reside pathSystemd = "/etc/systemd/system" // pathDevNull is the systems path to and endless blackhole @@ -202,7 +197,6 @@ func New( var ( osImageURL string osVersion string - ignVersion string err error ) @@ -222,13 +216,6 @@ func New( return nil, fmt.Errorf("error reading osImageURL from rpm-ostree: %v", err) } glog.Infof("Booted osImageURL: %s (%s)", osImageURL, osVersion) - - ignVersionBytes, err := exec.Command(pathIgnition, "--version").Output() - if err != nil { - return nil, fmt.Errorf("error getting installed Ignition version: %v", err) - } - ignVersion = strings.SplitAfter(string(ignVersionBytes), " ")[1] - glog.Infof("Installed Ignition binary version: %s", ignVersion) } bootID := "" @@ -257,7 +244,6 @@ func New( return &Daemon{ mock: mock, booting: true, - IgnitionVersion: ignVersion, os: os, NodeUpdaterClient: nodeUpdaterClient, bootedOSImageURL: osImageURL,