Fix prometheus test assertions for TLS

Author: mircea-cosbuc

test/e2e/e2eutil.go

@@ -115,11 +115,11 @@ func NewTestMongoDB(ctx *Context, name string, namespace string) (mdbv1.MongoDBC
 										Resources: corev1.ResourceRequirements{
 											Limits: map[corev1.ResourceName]resource.Quantity{
 												"cpu":    resource.MustParse("1.0"),
-												"memory": resource.MustParse("200M"),
+												"memory": resource.MustParse("500M"),
 											},
 											Requests: map[corev1.ResourceName]resource.Quantity{
-												"cpu":    resource.MustParse("0.1"),
-												"memory": resource.MustParse("200M"),
+												"cpu":    resource.MustParse("0.5"),
+												"memory": resource.MustParse("500M"),
 											},
 										},
 									},
@@ -128,11 +128,11 @@ func NewTestMongoDB(ctx *Context, name string, namespace string) (mdbv1.MongoDBC
 										Resources: corev1.ResourceRequirements{
 											Limits: map[corev1.ResourceName]resource.Quantity{
 												"cpu":    resource.MustParse("1.0"),
-												"memory": resource.MustParse("200M"),
+												"memory": resource.MustParse("500M"),
 											},
 											Requests: map[corev1.ResourceName]resource.Quantity{
-												"cpu":    resource.MustParse("0.1"),
-												"memory": resource.MustParse("200M"),
+												"cpu":    resource.MustParse("0.5"),
+												"memory": resource.MustParse("500M"),
 											},
 										},
 									},

test/e2e/prometheus/prometheus_test.go

@@ -44,21 +44,23 @@ func TestPrometheus(t *testing.T) {
 
 	t.Run("Create MongoDB Resource", mongodbtests.CreateMongoDBResource(&mdb, ctx))
 	t.Run("Basic tests", mongodbtests.BasicFunctionality(&mdb))
-	t.Run("Keyfile authentication is configured", tester.HasKeyfileAuth(3))
-	t.Run("Test Basic Connectivity", tester.ConnectivitySucceeds())
 
-	t.Run("Test Prometheus endpoint is active", tester.PrometheusEndpointIsReachable("prom-user", "prom-password", false))
-	t.Run("Ensure Authentication", tester.EnsureAuthenticationIsConfigured(3))
-	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 1))
+	mongodbtests.SkipTestIfLocal(t, "Ensure MongoDB with Prometheus configuration", func(t *testing.T) {
+		t.Run("Resource has TLS Mode", tester.HasTlsMode("requireSSL", 60, WithTls(mdb)))
+		t.Run("Test Basic Connectivity", tester.ConnectivitySucceeds(WithTls(mdb)))
+		t.Run("Test Prometheus endpoint is active", tester.PrometheusEndpointIsReachable("prom-user", "prom-password", false))
+		t.Run("Ensure Authentication", tester.EnsureAuthenticationIsConfigured(3, WithTls(mdb)))
+		t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 1))
 
-	t.Run("Enabling HTTPS on the Prometheus endpoint", func(t *testing.T) {
-		err = e2eutil.UpdateMongoDBResource(&mdb, func(mdb *v1.MongoDBCommunity) {
-			mdb.Spec.Prometheus.TLSSecretRef.Name = "tls-certificate"
-		})
-		assert.NoError(t, err)
+		t.Run("Enabling HTTPS on the Prometheus endpoint", func(t *testing.T) {
+			err = e2eutil.UpdateMongoDBResource(&mdb, func(mdb *v1.MongoDBCommunity) {
+				mdb.Spec.Prometheus.TLSSecretRef.Name = "tls-certificate"
+			})
+			assert.NoError(t, err)
 
-		t.Run("MongoDB Reaches Running Phase", mongodbtests.MongoDBReachesRunningPhase(&mdb))
-		t.Run("Test Prometheus HTTPS endpoint is active", tester.PrometheusEndpointIsReachable("prom-user", "prom-password", true))
+			t.Run("MongoDB Reaches Running Phase", mongodbtests.MongoDBReachesRunningPhase(&mdb))
+			t.Run("Test Prometheus HTTPS endpoint is active", tester.PrometheusEndpointIsReachable("prom-user", "prom-password", true))
+			t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 2))
+		})
 	})
-	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 2))
 }