Replace glog with klog kubernetes-sigs#99

Gopkg.toml

@@ -35,7 +35,7 @@ required = [
 
 [[constraint]]
   branch = "master"
-  name = "github.com/golang/glog"
+  name = "k8s.io/klog"
 
 [[constraint]]
   branch = "master"

cmd/manager/main.go

@@ -20,8 +20,8 @@ import (
 	"flag"
 	"log"
 
-	"github.com/golang/glog"
 	"github.com/spf13/pflag"
+	"k8s.io/klog"
 
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/apis"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/controller"
@@ -32,36 +32,36 @@ import (
 )
 
 func main() {
-	// the following line exists to make glog happy, for more information, see: https://github.com/kubernetes/kubernetes/issues/17162
+	// the following line exists to make klog happy, for more information, see: https://github.com/kubernetes/kubernetes/issues/17162
 	flag.CommandLine.Parse([]string{})
 	pflag.Parse()
 
 	// Get a config to talk to the apiserver
 	cfg, err := config.GetConfig()
 	if err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := manager.New(cfg, manager.Options{})
 	if err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
-	glog.Infof("Initializing Dependencies.")
+	klog.Infof("Initializing Dependencies.")
 
 	// Setup Scheme for all resources
 	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
 	if err := clusterapis.AddToScheme(mgr.GetScheme()); err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
 	// Setup all Controllers
 	if err := controller.AddToManager(mgr); err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
 	log.Printf("Starting the Cmd.")

pkg/cloud/openstack/clients/machineservice.go

@@ -20,14 +20,14 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/golang/glog"
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
 	"github.com/gophercloud/utils/openstack/clientconfig"
+	"k8s.io/klog"
 	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 )
 
@@ -109,7 +109,7 @@ func (is *InstanceService) UpdateToken() error {
 	if result {
 		return nil
 	}
-	glog.V(2).Infof("Toen is out of date, need get new token.")
+	klog.V(2).Infof("Toen is out of date, need get new token.")
 	reAuthFunction := is.provider.ReauthFunc
 	if reAuthFunction() != nil {
 		return fmt.Errorf("reAuth err: %v", err)

pkg/cloud/openstack/cluster/actuator.go

@@ -3,8 +3,8 @@ package cluster
 import (
 	"fmt"
 
-	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"k8s.io/klog"
 
 	providerv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
@@ -30,7 +30,7 @@ func NewActuator(params ActuatorParams) (*Actuator, error) {
 }
 
 func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
-	glog.Infof("Reconciling cluster %v.", cluster.Name)
+	klog.Infof("Reconciling cluster %v.", cluster.Name)
 
 	// Load provider config.
 	_, err := providerv1.ClusterConfigFromProviderConfig(cluster.Spec.ProviderConfig)
@@ -47,15 +47,15 @@ func (a *Actuator) Reconcile(cluster *clusterv1.Cluster) error {
 	/* Uncomment when the clusterGetter is back to working
 	defer func() {
 		if err := a.storeClusterStatus(cluster, status); err != nil {
-			glog.Errorf("failed to store provider status for cluster %q in namespace %q: %v", cluster.Name, cluster.Namespace, err)
+			klog.Errorf("failed to store provider status for cluster %q in namespace %q: %v", cluster.Name, cluster.Namespace, err)
 		}
 	}()*/
 	return nil
 }
 
 // Delete deletes a cluster and is invoked by the Cluster Controller
 func (a *Actuator) Delete(cluster *clusterv1.Cluster) error {
-	glog.Infof("Deleting cluster %v.", cluster.Name)
+	klog.Infof("Deleting cluster %v.", cluster.Name)
 
 	// Load provider config.
 	_, err := providerv1.ClusterConfigFromProviderConfig(cluster.Spec.ProviderConfig)

pkg/cloud/openstack/deployer.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 
 	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 	clustercommon "sigs.k8s.io/cluster-api/pkg/apis/cluster/common"
@@ -49,7 +49,7 @@ func NewDeploymentClient() *DeploymentClient {
 func (*DeploymentClient) GetIP(cluster *clusterv1.Cluster, machine *clusterv1.Machine) (string, error) {
 	if machine.ObjectMeta.Annotations != nil {
 		if ip, ok := machine.ObjectMeta.Annotations[OpenstackIPAnnotationKey]; ok {
-			glog.Infof("Returning IP from machine annotation %s", ip)
+			klog.Infof("Returning IP from machine annotation %s", ip)
 			return ip, nil
 		}
 	}

pkg/cloud/openstack/machine/actuator.go

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/klog"
 
 	tokenapi "k8s.io/cluster-bootstrap/token/api"
 	tokenutil "k8s.io/cluster-bootstrap/token/util"
@@ -160,7 +160,7 @@ func (oc *OpenstackClient) Create(cluster *clusterv1.Cluster, machine *clusterv1
 		return err
 	}
 	if instance != nil {
-		glog.Infof("Skipped creating a VM that already exists.\n")
+		klog.Infof("Skipped creating a VM that already exists.\n")
 		return nil
 	}
 
@@ -171,7 +171,7 @@ func (oc *OpenstackClient) Create(cluster *clusterv1.Cluster, machine *clusterv1
 	}
 	role, ok := machine.ObjectMeta.Labels["set"]
 	if !ok {
-		glog.Errorf("Check machine role err, treat as \"node\" by default")
+		klog.Errorf("Check machine role err, treat as \"node\" by default")
 		role = machinesetup.MachineRoleNode
 	}
 	startupScript, err := machineSetupConfig.GetSetupScript(role)
@@ -185,7 +185,7 @@ func (oc *OpenstackClient) Create(cluster *clusterv1.Cluster, machine *clusterv1
 				"error creating Openstack instance: %v", err))
 		}
 	} else {
-		glog.Info("Creating bootstrap token")
+		klog.Info("Creating bootstrap token")
 		token, err := oc.createBootstrapToken()
 		if err != nil {
 			return oc.handleMachineError(machine, apierrors.CreateMachine(
@@ -235,7 +235,7 @@ func (oc *OpenstackClient) Delete(cluster *clusterv1.Cluster, machine *clusterv1
 	}
 
 	if instance == nil {
-		glog.Infof("Skipped deleting a VM that is already deleted.\n")
+		klog.Infof("Skipped deleting a VM that is already deleted.\n")
 		return nil
 	}
 
@@ -262,7 +262,7 @@ func (oc *OpenstackClient) Update(cluster *clusterv1.Cluster, machine *clusterv1
 			return err
 		}
 		if instance != nil && instance.Status == "ACTIVE" {
-			glog.Infof("Populating current state for boostrap machine %v", machine.ObjectMeta.Name)
+			klog.Infof("Populating current state for boostrap machine %v", machine.ObjectMeta.Name)
 			return oc.updateAnnotation(machine, instance.ID)
 		} else {
 			return fmt.Errorf("Cannot retrieve current state to update machine %v", machine.ObjectMeta.Name)
@@ -275,16 +275,16 @@ func (oc *OpenstackClient) Update(cluster *clusterv1.Cluster, machine *clusterv1
 
 	if util.IsMaster(currentMachine) {
 		// TODO: add master inplace
-		glog.Errorf("master inplace update failed: %v", err)
+		klog.Errorf("master inplace update failed: %v", err)
 	} else {
-		glog.Infof("re-creating machine %s for update.", currentMachine.ObjectMeta.Name)
+		klog.Infof("re-creating machine %s for update.", currentMachine.ObjectMeta.Name)
 		err = oc.Delete(cluster, currentMachine)
 		if err != nil {
-			glog.Errorf("delete machine %s for update failed: %v", currentMachine.ObjectMeta.Name, err)
+			klog.Errorf("delete machine %s for update failed: %v", currentMachine.ObjectMeta.Name, err)
 		} else {
 			err = oc.Create(cluster, machine)
 			if err != nil {
-				glog.Errorf("create machine %s for update failed: %v", machine.ObjectMeta.Name, err)
+				klog.Errorf("create machine %s for update failed: %v", machine.ObjectMeta.Name, err)
 			}
 		}
 	}
@@ -378,7 +378,7 @@ func (oc *OpenstackClient) handleMachineError(machine *clusterv1.Machine, err *a
 		}
 	}
 
-	glog.Errorf("Machine error: %v", err.Message)
+	klog.Errorf("Machine error: %v", err.Message)
 	return err
 }