[NPM] Print running NPM version in stdout. (Azure#958)

* Print running NPM version in stdout which helps debugging purpose. Replace log with klog. * Correct formatting error

Author: JungukCho

npm/npm.go

@@ -10,7 +10,6 @@ import (
 "time"
 
 "github.com/Azure/azure-container-networking/aitelemetry"
-"github.com/Azure/azure-container-networking/log"
 
 "github.com/Azure/azure-container-networking/npm/ipsm"
 "github.com/Azure/azure-container-networking/npm/iptm"
@@ -25,6 +24,7 @@ import (
 networkinginformers "k8s.io/client-go/informers/networking/v1"
 "k8s.io/client-go/kubernetes"
 "k8s.io/client-go/tools/cache"
+"k8s.io/klog"
 utilexec "k8s.io/utils/exec"
 )
 
@@ -71,17 +71,17 @@ type NetworkPolicyManager struct {
 func (npMgr *NetworkPolicyManager) GetClusterState() telemetry.ClusterState {
 pods, err := npMgr.clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
 if err != nil {
-log.Logf("Error: Failed to list pods in GetClusterState")
+klog.Info("Error: Failed to list pods in GetClusterState")
 }
 
 namespaces, err := npMgr.clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})
 if err != nil {
-log.Logf("Error: Failed to list namespaces in GetClusterState")
+klog.Info("Error: Failed to list namespaces in GetClusterState")
 }
 
 networkpolicies, err := npMgr.clientset.NetworkingV1().NetworkPolicies("").List(context.TODO(), metav1.ListOptions{})
 if err != nil {
-log.Logf("Error: Failed to list networkpolicies in GetClusterState")
+klog.Info("Error: Failed to list networkpolicies in GetClusterState")
 }
 
 npMgr.clusterState.PodCount = len(pods.Items)
@@ -170,11 +170,11 @@ func (npMgr *NetworkPolicyManager) Start(stopCh <-chan struct{}) error {
 // NewNetworkPolicyManager creates a NetworkPolicyManager
 func NewNetworkPolicyManager(clientset *kubernetes.Clientset, informerFactory informers.SharedInformerFactory, exec utilexec.Interface, npmVersion string) *NetworkPolicyManager {
 // Clear out left over iptables states
-log.Logf("Azure-NPM creating, cleaning iptables")
+klog.Info("Azure-NPM creating, cleaning iptables")
 iptMgr := iptm.NewIptablesManager(exec, iptm.NewIptOperationShim())
 iptMgr.UninitNpmChains()
 
-log.Logf("Azure-NPM creating, cleaning existing Azure NPM IPSets")
+klog.Info("Azure-NPM creating, cleaning existing Azure NPM IPSets")
 ipsm.NewIpsetManager(exec).DestroyNpmIpsets()
 
 var (
@@ -196,7 +196,9 @@ func NewNetworkPolicyManager(clientset *kubernetes.Clientset, informerFactory in
 metrics.SendErrorLogAndMetric(util.NpmID, "Error: failed to retrieving kubernetes version")
 panic(err.Error)
 }
-log.Logf("API server version: %+v", serverVersion)
+
+// This K8s api server version information is used to support backward-compatibility in translatePolicy.go
+klog.Infof("Run NPM (%s) on K8s version %+v", npmVersion, serverVersion)
 
 if err = util.SetIsNewNwPolicyVerFlag(serverVersion); err != nil {
 metrics.SendErrorLogAndMetric(util.NpmID, "Error: failed to set IsNewNwPolicyVerFlag")

npm/plugin/main.go

@@ -14,6 +14,7 @@ import (
 "k8s.io/client-go/informers"
 "k8s.io/client-go/kubernetes"
 "k8s.io/client-go/rest"
+"k8s.io/klog"
 "k8s.io/utils/exec"
 )
 
@@ -37,11 +38,12 @@ func initLogging() error {
 }
 
 func main() {
-var err error
+klog.Infof("Start NPM version: %s", version)
 
+var err error
 defer func() {
 if r := recover(); r != nil {
-log.Logf("recovered from error: %v", err)
+klog.Infof("recovered from error: %v", err)
 }
 }()
 
@@ -60,7 +62,7 @@ func main() {
 // Creates the clientset
 clientset, err := kubernetes.NewForConfig(config)
 if err != nil {
-log.Logf("clientset creation failed with error %v.", err)
+klog.Infof("clientset creation failed with error %v.", err)
 panic(err.Error())
 }
 
@@ -71,17 +73,17 @@ func main() {
 factor := rand.Float64() + 1
 resyncPeriod := time.Duration(float64(minResyncPeriod.Nanoseconds()) * factor)
 
-log.Logf("[INFO] Resync period for NPM pod is set to %d.", int(resyncPeriod/time.Minute))
+klog.Infof("Resync period for NPM pod is set to %d.", int(resyncPeriod/time.Minute))
 factory := informers.NewSharedInformerFactory(clientset, resyncPeriod)
 
 npMgr := npm.NewNetworkPolicyManager(clientset, factory, exec.New(), version)
-metrics.CreateTelemetryHandle(npMgr.GetAppVersion(), npm.GetAIMetadata())
+metrics.CreateTelemetryHandle(version, npm.GetAIMetadata())
 
 restserver := restserver.NewNpmRestServer(restserver.DefaultHTTPListeningAddress)
 go restserver.NPMRestServerListenAndServe(npMgr)
 
 if err = npMgr.Start(wait.NeverStop); err != nil {
-log.Logf("npm failed with error %v.", err)
+klog.Infof("npm failed with error %v.", err)
 panic(err.Error)
 }