Update observability func tests

Signed-off-by: João Vilaça <[email protected]>

Author: machadovilaca

controllers/observability/pod_disruption_budget_at_limit.go

@@ -12,8 +12,11 @@ import (
 )
 
 const (
-	alertmanagerSvcHost = "https://alertmanager-main.openshift-monitoring.svc.cluster.local:9094"
-	TlsCertPath         = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+	// ServiceAccountTlsCertPath is the path to the service account TLS certificate
+	// used for TLS communication with the alertmanager API
+	ServiceAccountTlsCertPath = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+
+	AlertmanagerSvcHost = "https://alertmanager-main.openshift-monitoring.svc.cluster.local:9094"
 )
 
 func (r *Reconciler) ensurePodDisruptionBudgetAtLimitIsSilenced() error {
@@ -64,20 +67,28 @@ func (r *Reconciler) ensurePodDisruptionBudgetAtLimitIsSilenced() error {
 }
 
 func (r *Reconciler) NewAlertmanagerApi() (*alertmanager.Api, error) {
-	caCert, err := os.ReadFile(TlsCertPath)
+	httpClient, err := NewHTTPClient()
 	if err != nil {
-		return nil, fmt.Errorf("failed to read ca cert: %w", err)
+		return nil, fmt.Errorf("failed to create http client: %w", err)
 	}
 
-	caCertPool := x509.NewCertPool()
-	caCertPool.AppendCertsFromPEM(caCert)
+	return alertmanager.NewAPI(*httpClient, AlertmanagerSvcHost, r.config.BearerToken), nil
+}
 
-	httpClient := http.Client{}
-	httpClient.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{RootCAs: caCertPool},
+func NewHTTPClient() (*http.Client, error) {
+	caCert, err := os.ReadFile(ServiceAccountTlsCertPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read service account TLS certificate: %w", err)
 	}
 
-	return alertmanager.NewAPI(httpClient, alertmanagerSvcHost, r.config.BearerToken), nil
+	caCertPool := x509.NewCertPool()
+	caCertPool.AppendCertsFromPEM(caCert)
+
+	return &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{RootCAs: caCertPool},
+		},
+	}, nil
 }
 
 func FindPodDisruptionBudgetAtLimitSilence(amSilences []alertmanager.Silence) *alertmanager.Silence {

tests/func-tests/observability_controller_test.go

@@ -10,29 +10,20 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/kubevirt/hyperconverged-cluster-operator/controllers/commontestutils"
 	"github.com/kubevirt/hyperconverged-cluster-operator/controllers/observability"
+	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/alertmanager"
 	tests "github.com/kubevirt/hyperconverged-cluster-operator/tests/func-tests"
 )
 
 const testName = "observability_controller"
 
-var logger = logf.Log.WithName("observability-controller")
-
-var _ = Describe("Observability Controller", Label(tests.OpenshiftLabel, "observability_controller"), func() {
-	var r *observability.Reconciler
+var _ = Describe("Observability Controller", Label(tests.OpenshiftLabel, testName), func() {
+	var cli client.Client
 
 	BeforeEach(func(ctx context.Context) {
-		cli := tests.GetControllerRuntimeClient()
+		cli = tests.GetControllerRuntimeClient()
 		tests.FailIfNotOpenShift(ctx, cli, testName)
-
-		mgr, err := commontestutils.NewManagerMock(tests.GetClientConfig(), manager.Options{}, cli, logger)
-		Expect(err).ToNot(HaveOccurred())
-
-		r = observability.NewReconciler(mgr, tests.InstallNamespace, nil)
 	})
 
 	Context("PodDisruptionBudgetAtLimit", func() {
@@ -45,9 +36,10 @@ var _ = Describe("Observability Controller", Label(tests.OpenshiftLabel, "observ
 			}
 		})
 
-		It("should be silenced", func() {
-			amApi, err := r.NewAlertmanagerApi()
+		It("should be silenced", func(ctx context.Context) {
+			httpClient, err := observability.NewHTTPClient()
 			Expect(err).ToNot(HaveOccurred())
+			amApi := alertmanager.NewAPI(*httpClient, observability.AlertmanagerSvcHost, tests.GetClientConfig().BearerToken)
 
 			amSilences, err := amApi.ListSilences()
 			Expect(err).ToNot(HaveOccurred())
@@ -60,16 +52,15 @@ var _ = Describe("Observability Controller", Label(tests.OpenshiftLabel, "observ
 			Expect(err).ToNot(HaveOccurred())
 
 			// Restart pod to force reconcile (reconcile periodicity is 1h)
-			cli := tests.GetControllerRuntimeClient()
 			var hcoPods v1.PodList
-			err = cli.List(context.Background(), &hcoPods, &client.MatchingLabels{
+			err = cli.List(ctx, &hcoPods, &client.MatchingLabels{
 				"name": "hyperconverged-cluster-operator",
 			})
 			Expect(err).ToNot(HaveOccurred())
 			Expect(hcoPods.Items).ToNot(BeEmpty())
 
 			for _, pod := range hcoPods.Items {
-				err = cli.Delete(context.Background(), &pod)
+				err = cli.Delete(ctx, &pod)
 				Expect(err).ToNot(HaveOccurred())
 			}
 
@@ -85,7 +76,7 @@ var _ = Describe("Observability Controller", Label(tests.OpenshiftLabel, "observ
 })
 
 func serviceAccountTlsCertPathExists() (bool, error) {
-	_, err := os.Stat(observability.TlsCertPath)
+	_, err := os.Stat(observability.ServiceAccountTlsCertPath)
 	if errors.Is(err, os.ErrNotExist) {
 		return false, nil
 	}