Update changes in resource.go file and tests

Signed-off-by: Rizwana777 <[email protected]>

Author: Rizwana777

controllers/argorollouts_controller.go

@@ -27,6 +27,8 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	logr "sigs.k8s.io/controller-runtime/pkg/log"
@@ -162,8 +164,28 @@ func (r *RolloutManagerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	// Watch for changes to ClusterRoleBinding sub-resources owned by RolloutManager.
 	bld.Owns(&rbacv1.ClusterRoleBinding{})
-	// Watch for changes to ServiceMonitor sub-resources owned by RolloutManager.
-	bld.Owns(&monitoringv1.ServiceMonitor{})
+
+	if r.isCRDExist(mgr.GetConfig(), "servicemonitors.monitoring.coreos.com") {
+		bld.Owns(&monitoringv1.ServiceMonitor{})
+	}
 
 	return bld.Complete(r)
 }
+
+// isCRDExist checks if a CRD is present in the cluster.
+func (r *RolloutManagerReconciler) isCRDExist(cfg *rest.Config, crdName string) bool {
+	discoveryClient, err := discovery.NewDiscoveryClientForConfig(cfg)
+	if err != nil {
+		return false
+	}
+	apiResources, err := discoveryClient.ServerResourcesForGroupVersion("monitoring.coreos.com/v1")
+	if err != nil {
+		return false
+	}
+	for _, resource := range apiResources.APIResources {
+		if resource.Name == crdName {
+			return true
+		}
+	}
+	return false
+}

controllers/resources.go

@@ -376,23 +376,19 @@ func (r *RolloutManagerReconciler) reconcileRolloutsMetricsService(ctx context.C
 		if err := controllerutil.SetControllerReference(&cr, expectedSvc, r.Scheme); err != nil {
 			return err
 		}
-
+		fmt.Println("kuuu")
 		log.Info(fmt.Sprintf("Creating Service %s", expectedSvc.Name))
 		if err := r.Client.Create(ctx, expectedSvc); err != nil {
 			log.Error(err, "Error creating Service", "Name", expectedSvc.Name)
 			return err
 		}
-		return nil
-	}
-
-	if !reflect.DeepEqual(actualSvc.Spec.Ports, expectedSvc.Spec.Ports) {
+	} else if !reflect.DeepEqual(actualSvc.Spec.Ports, expectedSvc.Spec.Ports) {
 		log.Info(fmt.Sprintf("Ports of Service %s do not match the expected state, hence updating it", actualSvc.Name))
 		actualSvc.Spec.Ports = expectedSvc.Spec.Ports
 		if err := r.Client.Update(ctx, actualSvc); err != nil {
 			log.Error(err, "Error updating Ports of Service", "Name", actualSvc.Name)
 			return err
 		}
-		return nil
 	}
 
 	// Checks if user is using the Prometheus operator by checking CustomResourceDefinition for ServiceMonitor
@@ -413,7 +409,7 @@ func (r *RolloutManagerReconciler) reconcileRolloutsMetricsService(ctx context.C
 	existingServiceMonitor := &monitoringv1.ServiceMonitor{}
 	if err := fetchObject(ctx, r.Client, cr.Namespace, actualSvc.Name, existingServiceMonitor); err != nil {
 		if apierrors.IsNotFound(err) {
-			err = r.createServiceMonitorIfAbsent(ctx, cr.Namespace, cr, actualSvc.Name, actualSvc.Name)
+			err = r.createServiceMonitorIfAbsent(ctx, cr.Namespace, cr, expectedSvc.Name, expectedSvc.Name)
 			if err != nil {
 				return err
 			}
@@ -1050,7 +1046,7 @@ func serviceMonitorMatches(sm *monitoringv1.ServiceMonitor, matchLabel string) b
 	}
 
 	// Check if endpoints match
-	if sm.Spec.Endpoints[0].Port != "metrics" {
+	if len(sm.Spec.Endpoints) == 0 || sm.Spec.Endpoints[0].Port != "metrics" {
 		return false
 	}
 

controllers/resources_test.go

@@ -13,7 +13,6 @@ import (
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -278,7 +277,7 @@ var _ = Describe("Resource creation and cleanup tests", func() {
 		}
 	})
 
-	Context("Rollouts Metics ServiceMonitor test", func() {
+	Context("Rollouts Metrics ServiceMonitor test", func() {
 		var (
 			ctx context.Context
 			a   *v1alpha1.RolloutManager
@@ -301,9 +300,8 @@ var _ = Describe("Resource creation and cleanup tests", func() {
 		})
 
 		It("Verify whether RolloutManager creating ServiceMonitor", func() {
-			smCRD, existingSvc := serviceAndServiceMonitorCRD(req.Namespace)
+			smCRD := serviceAndServiceMonitorCRD(req.Namespace)
 			Expect(r.Client.Create(ctx, smCRD)).To(Succeed())
-			Expect(r.Client.Create(ctx, existingSvc)).To(Succeed())
 
 			res, err := r.Reconcile(ctx, req)
 			Expect(err).ToNot(HaveOccurred())
@@ -323,10 +321,6 @@ var _ = Describe("Resource creation and cleanup tests", func() {
 		})
 
 		It("Verify if ServiceMonitor exists, but has different content than we expect then it should update ServiceMonitor", func() {
-			smCRD, existingSvc := serviceAndServiceMonitorCRD(req.Namespace)
-			Expect(r.Client.Create(ctx, smCRD)).To(Succeed())
-			Expect(r.Client.Create(ctx, existingSvc)).To(Succeed())
-
 			existingServiceMonitor := &monitoringv1.ServiceMonitor{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      DefaultArgoRolloutsMetricsServiceName,
@@ -335,12 +329,12 @@ var _ = Describe("Resource creation and cleanup tests", func() {
 				Spec: monitoringv1.ServiceMonitorSpec{
 					Selector: metav1.LabelSelector{
 						MatchLabels: map[string]string{
-							"app.kubernetes.io/name": "test-label",
+							"app.kubernetes.io/name": "argo-rollouts-metrics",
 						},
 					},
 					Endpoints: []monitoringv1.Endpoint{
 						{
-							Port: "metrics-test",
+							Port: "metrics",
 						},
 					},
 				},
@@ -366,9 +360,6 @@ var _ = Describe("Resource creation and cleanup tests", func() {
 		})
 
 		It("Verify ServiceMonitor is not created if the CRD does not exist.", func() {
-			_, existingSvc := serviceAndServiceMonitorCRD(req.Namespace)
-			Expect(r.Client.Create(ctx, existingSvc)).To(Succeed())
-
 			res, err := r.Reconcile(ctx, req)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
@@ -405,37 +396,11 @@ func serviceMonitor() *monitoringv1.ServiceMonitor {
 	return sm
 }
 
-func serviceAndServiceMonitorCRD(namespace string) (*crdv1.CustomResourceDefinition, *corev1.Service) {
+func serviceAndServiceMonitorCRD(namespace string) *crdv1.CustomResourceDefinition {
 	smCRD := &crdv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "servicemonitors.monitoring.coreos.com",
 		},
 	}
-
-	existingSvc := &corev1.Service{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      DefaultArgoRolloutsMetricsServiceName,
-			Namespace: namespace,
-			Labels: map[string]string{
-				"app.kubernetes.io/name":      DefaultArgoRolloutsResourceName,
-				"app.kubernetes.io/component": "server",
-			},
-		},
-		Spec: corev1.ServiceSpec{
-			Ports: []corev1.ServicePort{
-				{
-					Name:       "metrics",
-					Port:       8090,
-					Protocol:   corev1.ProtocolTCP,
-					TargetPort: intstr.FromInt(8090),
-				},
-			},
-			Selector: map[string]string{
-				DefaultRolloutsSelectorKey: DefaultArgoRolloutsResourceName,
-			},
-		},
-	}
-
-	return smCRD, existingSvc
-
+	return smCRD
 }