Reduce noisy reconciles + enhance logs

cmd/machine-controller-manager/app/controllermanager.go

@@ -208,7 +208,7 @@ func StartControllers(s *options.MCMServer,
 	recorder record.EventRecorder,
 	stop <-chan struct{}) error {
 
-	klog.V(5).Info("Getting available resources")
+	klog.V(4).Info("Getting available resources")
 	availableResources, err := getAvailableResources(controlCoreClientBuilder)
 	if err != nil {
 		return err
@@ -229,7 +229,7 @@ func StartControllers(s *options.MCMServer,
 	}
 
 	if availableResources[machineGVR] || availableResources[machineSetGVR] || availableResources[machineDeploymentGVR] {
-		klog.V(5).Infof("Creating shared informers; resync interval: %v", s.MinResyncPeriod)
+		klog.V(4).Infof("Creating shared informers; resync interval: %v", s.MinResyncPeriod)
 
 		controlMachineInformerFactory := machineinformers.NewFilteredSharedInformerFactory(
 			controlMachineClientBuilder.ClientOrDie("control-machine-shared-informers"),
@@ -253,7 +253,7 @@ func StartControllers(s *options.MCMServer,
 		// All shared informers are v1alpha1 API level
 		machineSharedInformers := controlMachineInformerFactory.Machine().V1alpha1()
 
-		klog.V(5).Infof("Creating controllers...")
+		klog.V(4).Infof("Creating controllers...")
 		mcmController, err := mcmcontroller.NewController(
 			s.Namespace,
 			controlMachineClient,
@@ -276,7 +276,7 @@ func StartControllers(s *options.MCMServer,
 		controlCoreInformerFactory.Start(stop)
 		targetCoreInformerFactory.Start(stop)
 
-		klog.V(5).Info("Running controller")
+		klog.V(4).Info("Running controller")
 		go mcmController.Run(int(s.ConcurrentNodeSyncs), stop)
 
 	} else {

docs/documents/apis.md

@@ -1555,7 +1555,7 @@ to be.</p>
 <a href="#CurrentStatus">CurrentStatus</a>)
 </p>
 <p>
-<p>MachinePhase is a label for the condition of a machines at the current time.</p>
+<p>MachinePhase is a label for the condition of a machine at the current time.</p>
 </p>
 <br>
 <h3 id="MachineSetCondition">
@@ -1992,7 +1992,7 @@ MachineConfiguration
 <a href="#LastOperation">LastOperation</a>)
 </p>
 <p>
-<p>MachineState is a current state of the machine.</p>
+<p>MachineState is a current state of the operation.</p>
 </p>
 <br>
 <h3 id="MachineStatus">

kubernetes/crds/machine.sapcloud.io_machines.yaml

@@ -245,7 +245,7 @@ spec:
                     format: date-time
                     type: string
                   phase:
-                    description: MachinePhase is a label for the condition of a machines
+                    description: MachinePhase is a label for the condition of a machine
                       at the current time.
                     type: string
                   timeoutActive:

pkg/apis/machine/v1alpha1/machine_types.go

@@ -136,10 +136,10 @@ type LastOperation struct {
 	Type MachineOperationType `json:"type,omitempty"`
 }
 
-// MachinePhase is a label for the condition of a machines at the current time.
+// MachinePhase is a label for the condition of a machine at the current time.
 type MachinePhase string
 
-// These are the valid statuses of machines.
+// These are the valid phases of machines.
 const (
 	// MachinePending means that the machine is being created
 	MachinePending MachinePhase = "Pending"
@@ -156,25 +156,25 @@ const (
 	// MachineUnknown indicates that the node is not ready at the movement
 	MachineUnknown MachinePhase = "Unknown"
 
-	// MachineFailed means operation failed leading to machine status failure
+	// MachineFailed means operation timed out
 	MachineFailed MachinePhase = "Failed"
 
-	// MachineCrashLoopBackOff means creation or deletion of the machine is failing. It means that machine object is present but there is no corresponding VM.
+	// MachineCrashLoopBackOff means machine creation is failing. It means that machine object is present but there is no corresponding VM.
 	MachineCrashLoopBackOff MachinePhase = "CrashLoopBackOff"
 )
 
-// MachineState is a current state of the machine.
+// MachineState is a current state of the operation.
 type MachineState string
 
-// These are the valid statuses of machines.
+// These are the valid states of operations performed on the machine.
 const (
-	// MachineStatePending means there are operations pending on this machine state
+	// MachineStateProcessing means operation is not yet complete
 	MachineStateProcessing MachineState = "Processing"
 
-	// MachineStateFailed means operation failed leading to machine status failure
+	// MachineStateFailed means operation failed 
 	MachineStateFailed MachineState = "Failed"
 
-	// MachineStateSuccessful indicates that the node is not ready at the moment
+	// MachineStateSuccessful means operation completed successfully 
 	MachineStateSuccessful MachineState = "Successful"
 )
 
@@ -189,7 +189,7 @@ const (
 	// MachineOperationUpdate indicates that the operation was an update
 	MachineOperationUpdate MachineOperationType = "Update"
 
-	// MachineOperationHealthCheck indicates that the operation was a create
+	// MachineOperationHealthCheck indicates that the operation was a health check of node object
 	MachineOperationHealthCheck MachineOperationType = "HealthCheck"
 
 	// MachineOperationDelete indicates that the operation was a delete

pkg/util/provider/app/app.go

@@ -209,7 +209,7 @@ func StartControllers(s *options.MCServer,
 	recorder record.EventRecorder,
 	stop <-chan struct{}) error {
 
-	klog.V(5).Info("Getting available resources")
+	klog.V(4).Info("Getting available resources")
 	availableResources, err := getAvailableResources(controlCoreClientBuilder)
 	if err != nil {
 		return err
@@ -239,7 +239,7 @@ func StartControllers(s *options.MCServer,
 	}
 
 	if availableResources[machineGVR] {
-		klog.V(5).Infof("Creating shared informers; resync interval: %v", s.MinResyncPeriod)
+		klog.V(4).Infof("Creating shared informers; resync interval: %v", s.MinResyncPeriod)
 
 		controlMachineInformerFactory := machineinformers.NewFilteredSharedInformerFactory(
 			controlMachineClientBuilder.ClientOrDie("control-machine-shared-informers"),
@@ -274,7 +274,7 @@ func StartControllers(s *options.MCServer,
 		// All shared informers are v1alpha1 API level
 		machineSharedInformers := controlMachineInformerFactory.Machine().V1alpha1()
 
-		klog.V(5).Infof("Creating controllers...")
+		klog.V(4).Infof("Creating controllers...")
 		machineController, err := machinecontroller.NewController(
 			s.Namespace,
 			controlMachineClient,
@@ -305,7 +305,7 @@ func StartControllers(s *options.MCServer,
 		controlCoreInformerFactory.Start(stop)
 		targetCoreInformerFactory.Start(stop)
 
-		klog.V(5).Info("Running controller")
+		klog.V(4).Info("Running controller")
 		go machineController.Run(int(s.ConcurrentNodeSyncs), stop)
 
 	} else {

pkg/util/provider/drain/drain.go

@@ -934,7 +934,7 @@ func (o *Options) waitForReattach(ctx context.Context, podVolumeInfo PodVolumeIn
 
 		case incomingEvent := <-volumeAttachmentEventCh:
 			persistentVolumeName := *incomingEvent.Spec.Source.PersistentVolumeName
-			klog.V(5).Infof("VolumeAttachment event received for PV: %s", persistentVolumeName)
+			klog.V(4).Infof("VolumeAttachment event received for PV: %s", persistentVolumeName)
 
 			// Checking if event for an PV that is being waited on
 			if _, present := pvsWaitingForReattachments[persistentVolumeName]; present {

pkg/util/provider/drain/volume_attachment.go

@@ -70,13 +70,13 @@ func (v *VolumeAttachmentHandler) dispatch(obj interface{}) {
 
 // AddVolumeAttachment is the event handler for VolumeAttachment add
 func (v *VolumeAttachmentHandler) AddVolumeAttachment(obj interface{}) {
-	klog.V(5).Infof("Adding volume attachment object")
+	klog.V(4).Infof("Adding volume attachment object")
 	v.dispatch(obj)
 }
 
 // UpdateVolumeAttachment is the event handler for VolumeAttachment update
 func (v *VolumeAttachmentHandler) UpdateVolumeAttachment(oldObj, newObj interface{}) {
-	klog.V(5).Info("Updating volume attachment object")
+	klog.V(4).Info("Updating volume attachment object")
 	v.dispatch(newObj)
 }
 

pkg/util/provider/machinecontroller/controller.go

@@ -135,7 +135,6 @@ func NewController(
 	controller.pvcLister = pvcInformer.Lister()
 	controller.pvLister = pvInformer.Lister()
 	controller.secretLister = secretInformer.Lister()
-	// TODO: Need to handle K8s versions below 1.13 differently
 	controller.volumeAttachementLister = volumeAttachmentInformer.Lister()
 	controller.machineClassLister = machineClassInformer.Lister()
 	controller.nodeLister = nodeInformer.Lister()
@@ -158,7 +157,7 @@ func NewController(
 		controller.pdbV1beta1Synced = pdbV1beta1Informer.Informer().HasSynced
 	}
 
-	// Secret Controller Informers
+	// Secret Controller's Informers
 	secretInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    controller.secretAdd,
 		DeleteFunc: controller.secretDelete,
@@ -170,10 +169,9 @@ func NewController(
 		DeleteFunc: controller.machineClassToSecretDelete,
 	})
 
-	// Machine Class Controller Informers
+	// Machine Class Controller's Informers
 	machineInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    controller.machineToMachineClassAdd,
-		UpdateFunc: controller.machineToMachineClassUpdate,
 		DeleteFunc: controller.machineToMachineClassDelete,
 	})
 
@@ -183,7 +181,7 @@ func NewController(
 		DeleteFunc: controller.machineClassDelete,
 	})
 
-	// Machine Controller Informers
+	// Machine Controller's Informers
 	nodeInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc:    controller.addNodeToMachine,
 		UpdateFunc: controller.updateNodeToMachine,
@@ -196,7 +194,7 @@ func NewController(
 		DeleteFunc: controller.deleteMachine,
 	})
 
-	// MachineSafety Controller Informers
+	// MachineSafety Controller's Informers
 	// We follow the kubernetes way of reconciling the safety controller
 	// done by adding empty key objects. We initialize it, to trigger
 	// running of different safety loop on MCM startup.
@@ -209,7 +207,7 @@ func NewController(
 		DeleteFunc: controller.deleteMachineToSafety,
 	})
 
-	// Drain Controller Informers
+	// Drain Controller's Informers
 	if k8sutils.IsResourceSupported(
 		targetCoreClient,
 		schema.GroupResource{