WMCO does not create and manage endpoints

This commit removes the code responsible for
creating and managing metric endpoints object.
There is an endpoint named kubelet in the
kube-system namespace which contains all the
node IP addresses. WMCO can rely on this endpoint
and create the serviceMonitor which will change
the port from 10250 to 9182 which is our desired
metric port for the windows-exporter service

controllers/configmap_controller.go

@@ -46,7 +46,6 @@ import (
 	"github.com/openshift/windows-machine-config-operator/pkg/crypto"
 	"github.com/openshift/windows-machine-config-operator/pkg/ignition"
 	"github.com/openshift/windows-machine-config-operator/pkg/instance"
-	"github.com/openshift/windows-machine-config-operator/pkg/metrics"
 	"github.com/openshift/windows-machine-config-operator/pkg/nodeconfig"
 	"github.com/openshift/windows-machine-config-operator/pkg/patch"
 	"github.com/openshift/windows-machine-config-operator/pkg/secrets"
@@ -93,12 +92,6 @@ func NewConfigMapReconciler(mgr manager.Manager, clusterConfig cluster.Config, w
 		return nil, fmt.Errorf("error creating kubernetes clientset: %w", err)
 	}
 
-	// Initialize prometheus configuration
-	pc, err := metrics.NewPrometheusNodeConfig(clientset, watchNamespace)
-	if err != nil {
-		return nil, fmt.Errorf("unable to initialize Prometheus configuration: %w", err)
-	}
-
 	directClient, err := client.New(mgr.GetConfig(), client.Options{Scheme: mgr.GetScheme()})
 	if err != nil {
 		return nil, err
@@ -119,14 +112,13 @@ func NewConfigMapReconciler(mgr manager.Manager, clusterConfig cluster.Config, w
 
 	return &ConfigMapReconciler{
 		instanceReconciler: instanceReconciler{
-			client:               mgr.GetClient(),
-			k8sclientset:         clientset,
-			clusterServiceCIDR:   clusterConfig.Network().GetServiceCIDR(),
-			log:                  ctrl.Log.WithName("controllers").WithName(ConfigMapController),
-			watchNamespace:       watchNamespace,
-			recorder:             mgr.GetEventRecorderFor(ConfigMapController),
-			prometheusNodeConfig: pc,
-			platform:             clusterConfig.Platform(),
+			client:             mgr.GetClient(),
+			k8sclientset:       clientset,
+			clusterServiceCIDR: clusterConfig.Network().GetServiceCIDR(),
+			log:                ctrl.Log.WithName("controllers").WithName(ConfigMapController),
+			watchNamespace:     watchNamespace,
+			recorder:           mgr.GetEventRecorderFor(ConfigMapController),
+			platform:           clusterConfig.Platform(),
 		},
 		servicesManifest: svcData,
 		proxyEnabled:     proxyEnabled,
@@ -288,10 +280,6 @@ func (r *ConfigMapReconciler) reconcileNodes(ctx context.Context, windowsInstanc
 		return fmt.Errorf("error removing undesired nodes from cluster: %w", err)
 	}
 
-	// Once all the proper Nodes are in the cluster, configure the prometheus endpoints.
-	if err := r.prometheusNodeConfig.Configure(); err != nil {
-		return fmt.Errorf("unable to configure Prometheus: %w", err)
-	}
 	return nil
 }
 

controllers/controllers.go

@@ -21,7 +21,6 @@ import (
 	"github.com/openshift/windows-machine-config-operator/pkg/crypto"
 	"github.com/openshift/windows-machine-config-operator/pkg/instance"
 	"github.com/openshift/windows-machine-config-operator/pkg/metadata"
-	"github.com/openshift/windows-machine-config-operator/pkg/metrics"
 	"github.com/openshift/windows-machine-config-operator/pkg/nodeconfig"
 	"github.com/openshift/windows-machine-config-operator/pkg/secrets"
 	"github.com/openshift/windows-machine-config-operator/version"
@@ -51,8 +50,6 @@ type instanceReconciler struct {
 	watchNamespace string
 	// signer is a signer created from the user's private key
 	signer ssh.Signer
-	// prometheusNodeConfig stores information required to configure Prometheus
-	prometheusNodeConfig *metrics.PrometheusNodeConfig
 	// recorder to generate events
 	recorder record.EventRecorder
 	// platform indicates the cloud on which the cluster is running

controllers/windowsmachine_controller.go

@@ -30,7 +30,6 @@ import (
 	"github.com/openshift/windows-machine-config-operator/pkg/crypto"
 	"github.com/openshift/windows-machine-config-operator/pkg/instance"
 	"github.com/openshift/windows-machine-config-operator/pkg/metadata"
-	"github.com/openshift/windows-machine-config-operator/pkg/metrics"
 	"github.com/openshift/windows-machine-config-operator/pkg/nodeconfig"
 	"github.com/openshift/windows-machine-config-operator/pkg/secrets"
 	"github.com/openshift/windows-machine-config-operator/pkg/signer"
@@ -82,22 +81,15 @@ func NewWindowsMachineReconciler(mgr manager.Manager, clusterConfig cluster.Conf
 		return nil, fmt.Errorf("error creating machine client: %w", err)
 	}
 
-	// Initialize prometheus configuration
-	pc, err := metrics.NewPrometheusNodeConfig(clientset, watchNamespace)
-	if err != nil {
-		return nil, fmt.Errorf("unable to initialize Prometheus configuration: %w", err)
-	}
-
 	return &WindowsMachineReconciler{
 		instanceReconciler: instanceReconciler{
-			client:               mgr.GetClient(),
-			log:                  ctrl.Log.WithName("controller").WithName(WindowsMachineController),
-			k8sclientset:         clientset,
-			clusterServiceCIDR:   clusterConfig.Network().GetServiceCIDR(),
-			recorder:             mgr.GetEventRecorderFor(WindowsMachineController),
-			watchNamespace:       watchNamespace,
-			prometheusNodeConfig: pc,
-			platform:             clusterConfig.Platform(),
+			client:             mgr.GetClient(),
+			log:                ctrl.Log.WithName("controller").WithName(WindowsMachineController),
+			k8sclientset:       clientset,
+			clusterServiceCIDR: clusterConfig.Network().GetServiceCIDR(),
+			recorder:           mgr.GetEventRecorderFor(WindowsMachineController),
+			watchNamespace:     watchNamespace,
+			platform:           clusterConfig.Platform(),
 		},
 		machineClient: machineClient,
 	}, nil
@@ -243,7 +235,7 @@ func (r *WindowsMachineReconciler) Reconcile(ctx context.Context,
 			// In the case the machine was deleted, ensure that the metrics subsets are configured properly, so that
 			// the current Windows nodes are properly reflected there.
 			log.V(1).Info("not found")
-			return ctrl.Result{}, r.prometheusNodeConfig.Configure()
+			return ctrl.Result{}, nil
 		}
 		// Error reading the object - requeue the request.
 		return ctrl.Result{}, err
@@ -299,21 +291,11 @@ func (r *WindowsMachineReconciler) Reconcile(ctx context.Context,
 			}
 			if node.Annotations[metadata.VersionAnnotation] == version.Get() {
 				// version annotation exists with a valid value, node is fully configured.
-				// configure Prometheus when we have already configured Windows Nodes. This is required to update
-				// Endpoints object if it gets reverted when the operator pod restarts.
-				if err := r.prometheusNodeConfig.Configure(); err != nil {
-					return ctrl.Result{}, fmt.Errorf("unable to configure Prometheus: %w", err)
-				}
 				return ctrl.Result{}, nil
 			}
 		}
 	} else if *machine.Status.Phase != provisionedPhase {
 		log.V(1).Info("machine not provisioned", "phase", *machine.Status.Phase)
-		// configure Prometheus when a machine is not in `Running` or `Provisioned` phase. This configuration is
-		// required to update Endpoints object when Windows machines are being deleted.
-		if err := r.prometheusNodeConfig.Configure(); err != nil {
-			return ctrl.Result{}, fmt.Errorf("unable to configure Prometheus: %w", err)
-		}
 		// Machine is not in provisioned or running state, nothing we should do as of now
 		return ctrl.Result{}, nil
 	}
@@ -360,10 +342,6 @@ func (r *WindowsMachineReconciler) Reconcile(ctx context.Context,
 	}
 	r.recorder.Eventf(machine, core.EventTypeNormal, "MachineSetup",
 		"Machine %s configured successfully", machine.Name)
-	// configure Prometheus after a Windows machine is configured as a Node.
-	if err := r.prometheusNodeConfig.Configure(); err != nil {
-		return ctrl.Result{}, fmt.Errorf("unable to configure Prometheus: %w", err)
-	}
 	return ctrl.Result{}, nil
 }