MCO-565: MCO-568: Create initial stub for Machine OS Builder binary, Initial Opt-in Mechanism

Makefile

@@ -1,5 +1,5 @@
 MCO_COMPONENTS = daemon controller server operator
-EXTRA_COMPONENTS = apiserver-watcher
+EXTRA_COMPONENTS = apiserver-watcher machine-os-builder
 ALL_COMPONENTS = $(patsubst %,machine-config-%,$(MCO_COMPONENTS)) $(EXTRA_COMPONENTS)
 PREFIX ?= /usr
 GO111MODULE?=on

cmd/apiserver-watcher/main.go

@@ -3,7 +3,8 @@ package main
 import (
 	"flag"
 
-	"github.com/golang/glog"
+	"k8s.io/klog/v2"
+
 	"github.com/spf13/cobra"
 )
 
@@ -27,6 +28,6 @@ func init() {
 
 func main() {
 	if err := rootCmd.Execute(); err != nil {
-		glog.Exitf("Error executing %s: %v", componentName, err)
+		klog.Exitf("Error executing %s: %v", componentName, err)
 	}
 }

cmd/apiserver-watcher/run.go

@@ -15,8 +15,8 @@ import (
 
 	health "github.com/InVisionApp/go-health"
 	"github.com/InVisionApp/go-health/checkers"
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/machine-config-operator/pkg/version"
 )
@@ -54,7 +54,7 @@ func runRunCmd(cmd *cobra.Command, args []string) error {
 	flag.Parse()
 
 	// To help debugging, immediately log version
-	glog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
+	klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
 
 	uri, err := url.Parse(runOpts.healthCheckURL)
 	if err != nil {
@@ -117,9 +117,9 @@ func runRunCmd(cmd *cobra.Command, args []string) error {
 	signal.Notify(c, os.Interrupt)
 	go func() {
 		for sig := range c {
-			glog.Infof("Signal %s received: treating service as down", sig)
+			klog.Infof("Signal %s received: treating service as down", sig)
 			if err := handler.onFailure(); err != nil {
-				glog.Infof("Failed to mark service down on signal: %s", err)
+				klog.Infof("Failed to mark service down on signal: %s", err)
 			}
 			os.Exit(0)
 		}
@@ -147,7 +147,7 @@ func newHandler(uri *url.URL) (*handler, error) {
 	h := handler{
 		vips: addrs,
 	}
-	glog.Infof("Using VIPs %v", h.vips)
+	klog.Infof("Using VIPs %v", h.vips)
 	return &h, nil
 }
 
@@ -157,7 +157,7 @@ func (h *handler) onFailure() error {
 		if err := writeVipStateFile(vip, "down"); err != nil {
 			return err
 		}
-		glog.Infof("healthcheck failed, created downfile %s.down", vip)
+		klog.Infof("healthcheck failed, created downfile %s.down", vip)
 		if err := removeVipStateFile(vip, "up"); err != nil {
 			return err
 		}
@@ -171,7 +171,7 @@ func (h *handler) onSuccess() error {
 		if err := removeVipStateFile(vip, "down"); err != nil {
 			return err
 		}
-		glog.Infof("healthcheck succeeded, removed downfile %s.down", vip)
+		klog.Infof("healthcheck succeeded, removed downfile %s.down", vip)
 		if err := writeVipStateFile(vip, "up"); err != nil {
 			return err
 		}
@@ -246,7 +246,7 @@ func (sl *healthTracker) OnComplete(state *health.State) {
 		sl.succeeded++
 		if sl.succeeded >= sl.SuccessThreshold {
 			if sl.state != succeededTrackerState {
-				glog.Info("Running OnSuccess trigger")
+				klog.Info("Running OnSuccess trigger")
 				if err := sl.OnSuccess(); err != nil {
 					sl.ErrCh <- err
 				}
@@ -258,7 +258,7 @@ func (sl *healthTracker) OnComplete(state *health.State) {
 		sl.failed++
 		if sl.failed >= sl.FailureThreshold {
 			if sl.state != failedTrackerState {
-				glog.Info("Running OnFailure trigger")
+				klog.Info("Running OnFailure trigger")
 				if err := sl.OnFailure(); err != nil {
 					sl.ErrCh <- err
 				}

cmd/common/helpers.go

@@ -5,13 +5,13 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/golang/glog"
 	"github.com/openshift/machine-config-operator/internal/clients"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/klog/v2"
 
 	"context"
 
@@ -31,7 +31,7 @@ func CreateResourceLock(cb *clients.Builder, componentNamespace, componentName s
 
 	id, err := os.Hostname()
 	if err != nil {
-		glog.Fatalf("error creating lock: %v", err)
+		klog.Fatalf("error creating lock: %v", err)
 	}
 
 	// add a uniquifier so that two processes on the same host don't accidentally both become active
@@ -73,7 +73,7 @@ func GetLeaderElectionConfig(restcfg *rest.Config) configv1.LeaderElection {
 			return leaderelection.LeaderElectionSNOConfig(defaultLeaderElection)
 		}
 	} else {
-		glog.Warningf("unable to get cluster infrastructure status, using HA cluster values for leader election: %v", err)
+		klog.Warningf("unable to get cluster infrastructure status, using HA cluster values for leader election: %v", err)
 	}
 
 	return defaultLeaderElection
@@ -90,11 +90,11 @@ func SignalHandler(runCancel context.CancelFunc) {
 	// catch SIGINT and SIGTERM
 	signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 	sig := <-ch
-	glog.Infof("Shutting down due to: %s", sig)
+	klog.Infof("Shutting down due to: %s", sig)
 	// if we're shutting down, cancel the context so everything else will stop
 	runCancel()
-	glog.Infof("Context cancelled")
+	klog.Infof("Context cancelled")
 	sig = <-ch
-	glog.Fatalf("Received shutdown signal twice, exiting: %s", sig)
+	klog.Fatalf("Received shutdown signal twice, exiting: %s", sig)
 
 }

cmd/machine-config-controller/bootstrap.go

@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/machine-config-operator/pkg/controller/bootstrap"
 	"github.com/openshift/machine-config-operator/pkg/version"
@@ -37,13 +37,13 @@ func runbootstrapCmd(cmd *cobra.Command, args []string) {
 	flag.Parse()
 
 	// To help debugging, immediately log version
-	glog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
+	klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
 
 	if bootstrapOpts.manifestsDir == "" || bootstrapOpts.destinationDir == "" {
-		glog.Fatalf("--dest-dir or --manifest-dir not set")
+		klog.Fatalf("--dest-dir or --manifest-dir not set")
 	}
 
 	if err := bootstrap.New(rootOpts.templates, bootstrapOpts.manifestsDir, bootstrapOpts.pullSecretFile).Run(bootstrapOpts.destinationDir); err != nil {
-		glog.Fatalf("error running MCC[BOOTSTRAP]: %v", err)
+		klog.Fatalf("error running MCC[BOOTSTRAP]: %v", err)
 	}
 }

cmd/machine-config-controller/start.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/golang/glog"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/machine-config-operator/cmd/common"
 	"github.com/openshift/machine-config-operator/internal/clients"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
@@ -54,7 +54,7 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 	runContext, runCancel := context.WithCancel(context.Background())
 
 	// To help debugging, immediately log version
-	glog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
+	klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
 
 	cb, err := clients.NewBuilder(startOpts.kubeconfig)
 	if err != nil {
@@ -105,7 +105,7 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 		Callbacks: leaderelection.LeaderCallbacks{
 			OnStartedLeading: run,
 			OnStoppedLeading: func() {
-				glog.Infof("Stopped leading. Terminating.")
+				klog.Infof("Stopped leading. Terminating.")
 				os.Exit(0)
 			},
 		},

cmd/machine-config-daemon/firstboot_complete_machineconfig.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/golang/glog"
 	daemon "github.com/openshift/machine-config-operator/pkg/daemon"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"k8s.io/klog/v2"
 )
 
 var firstbootCompleteMachineconfig = &cobra.Command{
@@ -60,8 +60,8 @@ func executeFirstbootCompleteMachineConfig(cmd *cobra.Command, args []string) {
 	for {
 		err := runFirstBootCompleteMachineConfig(cmd, args)
 		if err != nil {
-			glog.Warningf("error: %v\n", err)
-			glog.Info("Sleeping 1 minute for retry")
+			klog.Warningf("error: %v\n", err)
+			klog.Info("Sleeping 1 minute for retry")
 			time.Sleep(time.Minute)
 		} else {
 			break

cmd/machine-config-daemon/start.go

@@ -13,13 +13,13 @@ import (
 	"github.com/google/renameio"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/golang/glog"
 	"github.com/openshift/machine-config-operator/internal/clients"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	"github.com/openshift/machine-config-operator/pkg/daemon"
 	daemonconsts "github.com/openshift/machine-config-operator/pkg/daemon/constants"
 	"github.com/openshift/machine-config-operator/pkg/version"
 	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
 )
 
 var (
@@ -82,18 +82,18 @@ func selfCopyToHost() error {
 	if err := t.CloseAtomicallyReplace(); err != nil {
 		return err
 	}
-	glog.Infof("Copied self to /run/bin/machine-config-daemon on host")
+	klog.Infof("Copied self to /run/bin/machine-config-daemon on host")
 	return nil
 }
 
 func runStartCmd(cmd *cobra.Command, args []string) {
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
-	glog.V(2).Infof("Options parsed: %+v", startOpts)
+	klog.V(2).Infof("Options parsed: %+v", startOpts)
 
 	// To help debugging, immediately log version
-	glog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
+	klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)
 
 	// See https://github.com/coreos/rpm-ostree/pull/1880
 	os.Setenv("RPMOSTREE_CLIENT_ID", "machine-config-operator")
@@ -102,24 +102,24 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 	if !onceFromMode {
 		// in the daemon case
 		if err := daemon.PrepareNamespace(startOpts.rootMount); err != nil {
-			glog.Fatalf("Binding pod mounts: %+v", err)
+			klog.Fatalf("Binding pod mounts: %+v", err)
 		}
 	}
 
-	glog.Infof(`Calling chroot("%s")`, startOpts.rootMount)
+	klog.Infof(`Calling chroot("%s")`, startOpts.rootMount)
 	if err := syscall.Chroot(startOpts.rootMount); err != nil {
-		glog.Fatalf("Unable to chroot to %s: %s", startOpts.rootMount, err)
+		klog.Fatalf("Unable to chroot to %s: %s", startOpts.rootMount, err)
 	}
 
-	glog.V(2).Infof("Moving to / inside the chroot")
+	klog.V(2).Infof("Moving to / inside the chroot")
 	if err := os.Chdir("/"); err != nil {
-		glog.Fatalf("Unable to change directory to /: %s", err)
+		klog.Fatalf("Unable to change directory to /: %s", err)
 	}
 
 	if startOpts.nodeName == "" {
 		name, ok := os.LookupEnv("NODE_NAME")
 		if !ok || name == "" {
-			glog.Fatalf("node-name is required")
+			klog.Fatalf("node-name is required")
 		}
 		startOpts.nodeName = name
 	}
@@ -134,53 +134,53 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 		exitCh,
 	)
 	if err != nil {
-		glog.Fatalf("Failed to initialize single run daemon: %v", err)
+		klog.Fatalf("Failed to initialize single run daemon: %v", err)
 	}
 
 	// If we are asked to run once and it's a valid file system path use
 	// the bare Daemon
 	if startOpts.onceFrom != "" {
 		err = dn.RunOnceFrom(startOpts.onceFrom, startOpts.skipReboot)
 		if err != nil {
-			glog.Fatalf("%v", err)
+			klog.Fatalf("%v", err)
 		}
 		return
 	}
 
 	// In the cluster case, for now we copy our binary out to the host
 	// for SELinux reasons, see https://bugzilla.redhat.com/show_bug.cgi?id=1839065
 	if err := selfCopyToHost(); err != nil {
-		glog.Fatalf("%v", fmt.Errorf("copying self to host: %w", err))
+		klog.Fatalf("%v", fmt.Errorf("copying self to host: %w", err))
 		return
 	}
 
 	// Use kubelet kubeconfig file to get the URL to kube-api-server
 	kubeconfig, err := clientcmd.LoadFromFile("/etc/kubernetes/kubeconfig")
 	if err != nil {
-		glog.Fatalf("failed to load kubelet kubeconfig: %v", err)
+		klog.Fatalf("failed to load kubelet kubeconfig: %v", err)
 	}
 	clusterName := kubeconfig.Contexts[kubeconfig.CurrentContext].Cluster
 	apiURL := kubeconfig.Clusters[clusterName].Server
 
 	url, err := url.Parse(apiURL)
 	if err != nil {
-		glog.Fatalf("failed to parse api url from kubelet kubeconfig: %v", err)
+		klog.Fatalf("failed to parse api url from kubelet kubeconfig: %v", err)
 	}
 
 	// The kubernetes in-cluster functions don't let you override the apiserver
 	// directly; gotta "pass" it via environment vars.
-	glog.Infof("overriding kubernetes api to %s", apiURL)
+	klog.Infof("overriding kubernetes api to %s", apiURL)
 	os.Setenv("KUBERNETES_SERVICE_HOST", url.Hostname())
 	os.Setenv("KUBERNETES_SERVICE_PORT", url.Port())
 
 	cb, err := clients.NewBuilder(startOpts.kubeconfig)
 	if err != nil {
-		glog.Fatalf("Failed to initialize ClientBuilder: %v", err)
+		klog.Fatalf("Failed to initialize ClientBuilder: %v", err)
 	}
 
 	kubeClient, err := cb.KubeClient(componentName)
 	if err != nil {
-		glog.Fatalf("Cannot initialize kubeClient: %v", err)
+		klog.Fatalf("Cannot initialize kubeClient: %v", err)
 	}
 
 	// This channel is used to ensure all spawned goroutines exit when we exit.
@@ -225,7 +225,7 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 		startOpts.kubeletHealthzEndpoint,
 	)
 	if err != nil {
-		glog.Fatalf("Failed to initialize: %v", err)
+		klog.Fatalf("Failed to initialize: %v", err)
 	}
 
 	ctx.KubeInformerFactory.Start(stopCh)