refactor db construction

Author: nammn

controllers/operator/construct/construction_test.go

@@ -1,6 +1,7 @@
 package construct
 
 import (
+	"github.com/google/go-cmp/cmp"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -261,10 +262,7 @@ func checkPvClaims(t *testing.T, set appsv1.StatefulSet, expectedClaims []corev1
 
 func checkMounts(t *testing.T, set appsv1.StatefulSet, expectedMounts []corev1.VolumeMount) {
 	assert.Len(t, set.Spec.Template.Spec.Containers[0].VolumeMounts, len(expectedMounts))
-
-	for i, c := range expectedMounts {
-		assert.Equal(t, c, set.Spec.Template.Spec.Containers[0].VolumeMounts[i])
-	}
+	cmp.Equal(expectedMounts, set.Spec.Template.Spec.Containers[0].VolumeMounts)
 }
 
 func pvClaim(pvName, size string, storageClass *string, labels map[string]string) corev1.PersistentVolumeClaim {

controllers/operator/construct/database_construction.go

@@ -421,7 +421,7 @@ func buildDatabaseStatefulSetConfigurationFunction(mdb databaseStatefulSetSource
 	}
 
 	secretsToInject := buildVaultDatabaseSecretsToInject(mdb, opts)
-	volumes, _, pvcFuncs := getVolumesAndPVCs(mdb, opts, secretsToInject, log)
+	volumes, volumeMounts, pvcFuncs := getVolumesAndPVCs(mdb, opts, secretsToInject, log)
 
 	volumesFunc := func(spec *corev1.PodTemplateSpec) {
 		for _, v := range volumes {
@@ -492,6 +492,7 @@ func buildDatabaseStatefulSetConfigurationFunction(mdb databaseStatefulSetSource
 			volumesFunc,
 			configureImagePullSecrets,
 			podTemplateSpecFunc,
+			podtemplatespec.WithAllVolumeMounts(volumeMounts...),
 		)),
 	)
 }
@@ -543,7 +544,7 @@ func buildPersistentVolumeClaimsFuncs(opts DatabaseStatefulSetOptions) (map[stri
 	return claims, mounts
 }
 
-func sharedDatabaseContainerFunc(databaseImage string, podSpecWrapper mdbv1.PodSpecWrapper, volumeMounts []corev1.VolumeMount, configureContainerSecurityContext container.Modification, port int32) container.Modification {
+func sharedDatabaseContainerFunc(databaseImage string, podSpecWrapper mdbv1.PodSpecWrapper, configureContainerSecurityContext container.Modification, port int32) container.Modification {
 	return container.Apply(
 		container.WithResourceRequirements(buildRequirementsFromPodSpec(podSpecWrapper)),
 		container.WithPorts([]corev1.ContainerPort{{ContainerPort: port}}),
@@ -665,9 +666,6 @@ func buildMongoDBPodTemplateSpec(opts DatabaseStatefulSetOptions, mdb databaseSt
 	scriptsVolume := statefulset.CreateVolumeFromEmptyDir("database-scripts")
 	volumes := []corev1.Volume{scriptsVolume}
 
-	secretsToInject := buildVaultDatabaseSecretsToInject(mdb, opts)
-	_, volumeMounts, _ := getVolumesAndPVCs(mdb, opts, secretsToInject, log)
-
 	pullSecretsConfigurationFunc := podtemplatespec.NOOP()
 	if pullSecrets, ok := env.Read(util.ImagePullSecrets); ok { // nolint:forbidigo
 		pullSecretsConfigurationFunc = podtemplatespec.WithImagePullSecrets(pullSecrets)
@@ -682,49 +680,41 @@ func buildMongoDBPodTemplateSpec(opts DatabaseStatefulSetOptions, mdb databaseSt
 		podtemplatespec.WithTopologyKey(opts.PodSpec.GetTopologyKeyOrDefault(), 0),
 		podtemplatespec.WithServiceAccount(serviceAccountName),
 		podtemplatespec.WithVolumes(volumes),
-		buildContainers(opts, mdb, volumeMounts),
+		buildContainers(opts, mdb),
 	)
 }
 
 // buildContainers directly creates and configures all containers based on architecture
-func buildContainers(opts DatabaseStatefulSetOptions, mdb databaseStatefulSetSource, volumeMounts []corev1.VolumeMount) func(*corev1.PodTemplateSpec) {
+func buildContainers(opts DatabaseStatefulSetOptions, mdb databaseStatefulSetSource) func(*corev1.PodTemplateSpec) {
 	return func(podTemplateSpec *corev1.PodTemplateSpec) {
 		isStaticArchitecture := architectures.IsRunningStaticArchitecture(mdb.GetAnnotations())
 
 		if isStaticArchitecture {
-			buildStaticArchitectureContainers(podTemplateSpec, opts, mdb, volumeMounts)
+			buildStaticArchitectureContainers(podTemplateSpec, opts, mdb)
 		} else {
-			buildNonStaticArchitectureContainers(podTemplateSpec, opts, volumeMounts)
-		}
-
-		// Apply hostname override volume mounts if specified
-		if opts.HostNameOverrideConfigmapName != "" {
-			applyHostnameOverrideVolumeMounts(podTemplateSpec, opts.HostNameOverrideConfigmapName)
+			buildNonStaticArchitectureContainers(podTemplateSpec, opts)
 		}
 	}
 }
 
 // buildStaticArchitectureContainers creates containers for static architecture
-func buildStaticArchitectureContainers(podTemplateSpec *corev1.PodTemplateSpec, opts DatabaseStatefulSetOptions, mdb databaseStatefulSetSource, volumeMounts []corev1.VolumeMount) {
+func buildStaticArchitectureContainers(podTemplateSpec *corev1.PodTemplateSpec, opts DatabaseStatefulSetOptions, mdb databaseStatefulSetSource) {
 	podTemplateSpec.Spec.Containers = make([]corev1.Container, 3)
 	podTemplateSpec.Spec.Containers[0] = createAgentContainer(opts, mdb)
 	podTemplateSpec.Spec.Containers[1] = createMongodBinaryHolderContainer(opts)
 	podTemplateSpec.Spec.Containers[2] = createAgentUtilitiesHolderContainer()
-	container.WithVolumeMounts(volumeMounts)(&podTemplateSpec.Spec.Containers[0])
-	container.WithVolumeMounts(volumeMounts)(&podTemplateSpec.Spec.Containers[1])
-	container.WithVolumeMounts(volumeMounts)(&podTemplateSpec.Spec.Containers[2])
 
 	// Apply common configurations to all containers
 	applyCommonStaticConfigurations(podTemplateSpec.Spec.Containers, opts)
 }
 
 // buildNonStaticArchitectureContainers creates containers for non-static architecture
-func buildNonStaticArchitectureContainers(podTemplateSpec *corev1.PodTemplateSpec, opts DatabaseStatefulSetOptions, volumeMounts []corev1.VolumeMount) {
+func buildNonStaticArchitectureContainers(podTemplateSpec *corev1.PodTemplateSpec, opts DatabaseStatefulSetOptions) {
 	podTemplateSpec.Spec.Containers = make([]corev1.Container, 1)
 	podTemplateSpec.Spec.InitContainers = make([]corev1.Container, 1)
 
 	podTemplateSpec.Spec.InitContainers[0] = createDatabaseInitContainer(opts)
-	podTemplateSpec.Spec.Containers[0] = createDatabaseContainer(opts, volumeMounts)
+	podTemplateSpec.Spec.Containers[0] = createDatabaseContainer(opts)
 }
 
 // createAgentContainer creates the agent container for static architecture
@@ -786,7 +776,7 @@ func createDatabaseInitContainer(opts DatabaseStatefulSetOptions) corev1.Contain
 }
 
 // createDatabaseContainer creates the database container for non-static architecture
-func createDatabaseContainer(opts DatabaseStatefulSetOptions, volumeMounts []corev1.VolumeMount) corev1.Container {
+func createDatabaseContainer(opts DatabaseStatefulSetOptions) corev1.Container {
 	// scripts volume is shared by the init container and the AppDB, so the startup
 	// script can be copied over
 
@@ -795,7 +785,7 @@ func createDatabaseContainer(opts DatabaseStatefulSetOptions, volumeMounts []cor
 		Image:           opts.DatabaseNonStaticImage,
 		Command:         []string{"/opt/scripts/agent-launcher.sh"},
 		Env:             databaseEnvVars(opts),
-		VolumeMounts:    append(volumeMounts, databaseScriptsVolumeMount(true)),
+		VolumeMounts: 	 []corev1.VolumeMount{databaseScriptsVolumeMount(true)},
 		Resources:       buildRequirementsFromPodSpec(*opts.PodSpec),
 		Ports:           []corev1.ContainerPort{{ContainerPort: opts.ServicePort}},
 		ImagePullPolicy: corev1.PullPolicy(env.ReadOrPanic(util.AutomationAgentImagePullPolicy)),
@@ -810,7 +800,7 @@ func createDatabaseContainer(opts DatabaseStatefulSetOptions, volumeMounts []cor
 
 	_, containerSecurityContext := podtemplatespec.WithDefaultSecurityContextsModifications()
 
-	sharedDatabaseContainerFunc(opts.DatabaseNonStaticImage, *opts.PodSpec, volumeMounts, containerSecurityContext, opts.ServicePort)(&c)
+	sharedDatabaseContainerFunc(opts.DatabaseNonStaticImage, *opts.PodSpec, containerSecurityContext, opts.ServicePort)(&c)
 
 	return c
 }

mongodb-community-operator/pkg/kube/podtemplatespec/podspec_template.go

@@ -271,6 +271,19 @@ func WithVolumeMounts(containerName string, volumeMounts ...corev1.VolumeMount)
 	}
 }
 
+// WithAllVolumeMounts will add volume mounts to all containers
+func WithAllVolumeMounts(volumeMounts ...corev1.VolumeMount) Modification {
+	return func(podTemplateSpec *corev1.PodTemplateSpec) {
+		for _, volumeMount := range volumeMounts {
+			// Apply to all containers
+			for i := range podTemplateSpec.Spec.Containers {
+				podTemplateSpec.Spec.Containers[i].VolumeMounts = append(
+					podTemplateSpec.Spec.Containers[i].VolumeMounts, volumeMount)
+			}
+		}
+	}
+}
+
 func RemoveVolumeMount(containerName string, volumeMount string) Modification {
 	return func(podTemplateSpec *corev1.PodTemplateSpec) {
 		c := FindContainerByName(containerName, podTemplateSpec)