CLOUDP-93590: Service name configurable (#616)

Author: FlorentinaSimlinger

api/v1/mongodbcommunity_types.go

@@ -524,9 +524,12 @@ func (m MongoDBCommunity) Hosts() []string {
 	return hosts
 }
 
-// ServiceName returns the name of the Service that should be created for
-// this resource
+// ServiceName returns the name of the Service that should be created for this resource
 func (m MongoDBCommunity) ServiceName() string {
+	serviceName := m.Spec.StatefulSetConfiguration.SpecWrapper.Spec.ServiceName
+	if serviceName != "" {
+		return serviceName
+	}
 	return m.Name + "-svc"
 }
 

config/samples/arbitrary_statefulset_configuration/mongodb.com_v1_custom_volume_cr.yaml

@@ -23,6 +23,7 @@ spec:
 
   statefulSet:
     spec:
+        # Name for the service object created by the operator
       serviceName: example-openshift-mongodb-svc
       selector: {}
         # Specifies a size for the data volume different from the default 10Gi

docs/RELEASE_NOTES.md

@@ -8,6 +8,7 @@
   - Support SHA-1 as an authentication method.
   - Upgraded `mongodbcommunity.mongodbcommunity.mongodb.com` CRD to `v1` from `v1beta1`
     *  Users upgrading their CRD from v1beta1 to v1 need to set: `spec.preserveUnknownFields` to `false` in the CRD file `config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml` before applying the CRD to the cluster.
+  - Made service name configurable in mongdb custom resource with statefulSet.spec.serviceName
 
 ## Updated Image Tags
 

test/e2e/mongodbtests/mongodbtests.go

@@ -289,6 +289,19 @@ func BasicFunctionality(mdb *mdbv1.MongoDBCommunity) func(*testing.T) {
 	}
 }
 
+// ServiceWithNameExists checks whether a service with the name serviceName exists
+func ServiceWithNameExists(serviceName string, namespace string) func(t *testing.T) {
+	return func(t *testing.T) {
+		serviceNamespacedName := types.NamespacedName{Name: serviceName, Namespace: namespace}
+		srv := corev1.Service{}
+		err := e2eutil.TestClient.Get(context.TODO(), serviceNamespacedName, &srv)
+		if err != nil {
+			t.Fatal(err)
+		}
+		t.Logf("Service with name %s exists", serviceName)
+	}
+}
+
 // DeletePod will delete a pod that belongs to this MongoDB resource's StatefulSet
 func DeletePod(mdb *mdbv1.MongoDBCommunity, podNum int) func(*testing.T) {
 	return func(t *testing.T) {

test/e2e/statefulset_arbitrary_config/statefulset_arbitrary_config_test.go

@@ -34,13 +34,17 @@ func TestStatefulSetArbitraryConfig(t *testing.T) {
 
 	mdb.Spec.StatefulSetConfiguration.SpecWrapper.Spec.Template.Spec.Containers[1].ReadinessProbe = &corev1.Probe{TimeoutSeconds: 100}
 
+	customServiceName := "database"
+	mdb.Spec.StatefulSetConfiguration.SpecWrapper.Spec.ServiceName = customServiceName
+
 	tester, err := mongotester.FromResource(t, mdb)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	t.Run("Create MongoDB Resource", mongodbtests.CreateMongoDBResource(&mdb, ctx))
 	t.Run("Basic tests", mongodbtests.BasicFunctionality(&mdb))
+	t.Run("Test setting Service Name", mongodbtests.ServiceWithNameExists(customServiceName, mdb.Namespace))
 	t.Run("Test Basic Connectivity", tester.ConnectivitySucceeds())
 	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 1))
 	t.Run("Container has been merged by name", mongodbtests.StatefulSetContainerConditionIsTrue(&mdb, "mongodb-agent", func(container corev1.Container) bool {