refactor db construction

Author: nammn

controllers/operator/construct/database_construction.go

@@ -108,8 +108,8 @@ type DatabaseStatefulSetOptions struct {
 	// InitDatabaseImage is the image used for the init container as well as for the static binary holder
 	InitDatabaseImage      string
 	DatabaseNonStaticImage string
-	MongodbImage               string
-	AgentImage                 string
+	MongodbImage           string
+	AgentImage             string
 
 	Annotations map[string]string
 	VaultConfig vault.VaultConfiguration
@@ -414,8 +414,6 @@ func buildDatabaseStatefulSetConfigurationFunction(mdb databaseStatefulSetSource
 		PodAntiAffinityLabelKey: opts.Name,
 	}
 
-	configurePodSpecSecurityContext, _ := podtemplatespec.WithDefaultSecurityContextsModifications()
-
 	configureImagePullSecrets := podtemplatespec.NOOP()
 	name, found := env.Read(util.ImagePullSecrets) // nolint:forbidigo
 	if found {
@@ -469,8 +467,6 @@ func buildDatabaseStatefulSetConfigurationFunction(mdb databaseStatefulSetSource
 	}
 
 	shareProcessNs := statefulset.NOOP()
-	secondContainerModification := podtemplatespec.NOOP()
-
 	if architectures.IsRunningStaticArchitecture(mdb.GetAnnotations()) {
 		shareProcessNs = func(sts *appsv1.StatefulSet) {
 			sts.Spec.Template.Spec.ShareProcessNamespace = ptr.To(true)
@@ -493,9 +489,7 @@ func buildDatabaseStatefulSetConfigurationFunction(mdb databaseStatefulSetSource
 			podtemplatespec.WithAffinity(podAffinity, PodAntiAffinityLabelKey, 100),
 			podtemplatespec.WithTerminationGracePeriodSeconds(util.DefaultPodTerminationPeriodSeconds),
 			podtemplatespec.WithPodLabels(podLabels),
-			secondContainerModification,
 			volumesFunc,
-			configurePodSpecSecurityContext,
 			configureImagePullSecrets,
 			podTemplateSpecFunc,
 		)),
@@ -664,21 +658,16 @@ func getVolumesAndVolumeMounts(mdb databaseStatefulSetSource, databaseOpts Datab
 // buildMongoDBPodTemplateSpec constructs the podTemplateSpec for the MongoDB resource
 func buildMongoDBPodTemplateSpec(opts DatabaseStatefulSetOptions, mdb databaseStatefulSetSource, log *zap.SugaredLogger) podtemplatespec.Modification {
 	serviceAccountName := getServiceAccountName(opts)
+	configurePodSpecSecurityContext, _ := podtemplatespec.WithDefaultSecurityContextsModifications()
 
 	// scripts volume is shared by the init container and the AppDB, so the startup
 	// script can be copied over
 	scriptsVolume := statefulset.CreateVolumeFromEmptyDir("database-scripts")
-
 	volumes := []corev1.Volume{scriptsVolume}
+
 	secretsToInject := buildVaultDatabaseSecretsToInject(mdb, opts)
 	_, volumeMounts, _ := getVolumesAndPVCs(mdb, opts, secretsToInject, log)
 
-	// Add hostname override volume if specified
-	if opts.HostNameOverrideConfigmapName != "" {
-		volumes = append(volumes, statefulset.CreateVolumeFromConfigMap(opts.HostNameOverrideConfigmapName, opts.HostNameOverrideConfigmapName))
-	}
-
-	configurePodSpecSecurityContext, _ := podtemplatespec.WithDefaultSecurityContextsModifications()
 	pullSecretsConfigurationFunc := podtemplatespec.NOOP()
 	if pullSecrets, ok := env.Read(util.ImagePullSecrets); ok { // nolint:forbidigo
 		pullSecretsConfigurationFunc = podtemplatespec.WithImagePullSecrets(pullSecrets)
@@ -798,12 +787,15 @@ func createDatabaseInitContainer(opts DatabaseStatefulSetOptions) corev1.Contain
 
 // createDatabaseContainer creates the database container for non-static architecture
 func createDatabaseContainer(opts DatabaseStatefulSetOptions, volumeMounts []corev1.VolumeMount) corev1.Container {
+	// scripts volume is shared by the init container and the AppDB, so the startup
+	// script can be copied over
+
 	c := corev1.Container{
 		Name:            util.DatabaseContainerName,
 		Image:           opts.DatabaseNonStaticImage,
 		Command:         []string{"/opt/scripts/agent-launcher.sh"},
 		Env:             databaseEnvVars(opts),
-		VolumeMounts:    volumeMounts,
+		VolumeMounts:    append(volumeMounts, databaseScriptsVolumeMount(true)),
 		Resources:       buildRequirementsFromPodSpec(*opts.PodSpec),
 		Ports:           []corev1.ContainerPort{{ContainerPort: opts.ServicePort}},
 		ImagePullPolicy: corev1.PullPolicy(env.ReadOrPanic(util.AutomationAgentImagePullPolicy)),
@@ -818,7 +810,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, volumeMounts, containerSecurityContext, opts.ServicePort)(&c)
 
 	return c
 }