Skip to content

CLOUDP-85272: remove persistence method from interface #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2021
Merged

CLOUDP-85272: remove persistence method from interface #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions api/v1/mongodbcommunity_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,6 @@ func (m MongoDBCommunity) GetMongoDBVersionForAnnotation() string {
return m.GetMongoDBVersion()
}

func (m MongoDBCommunity) Persistent() bool {
return true
}

func (m *MongoDBCommunity) StatefulSetReplicasThisReconciliation() int {
return scale.ReplicasThisReconciliation(m)
}
Expand Down
32 changes: 14 additions & 18 deletions controllers/construct/mongodbstatefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ type MongoDBStatefulSetOwner interface {
AutomationConfigSecretName() string
// GetUpdateStrategyType returns the UpdateStrategyType of the statefulset.
GetUpdateStrategyType() appsv1.StatefulSetUpdateStrategyType
// Persistent returns whether or not the statefulset should have persistent volumes added.
Persistent() bool
// HasSeparateDataAndLogsVolumes returns whether or not the volumes for data and logs would need to be different.
HasSeparateDataAndLogsVolumes() bool
// GetAgentScramKeyfileSecretNamespacedName returns the NamespacedName of the secret which stores the keyfile for the agent.
Expand Down Expand Up @@ -120,23 +118,21 @@ func BuildMongoDBReplicaSetStatefulSetModificationFunction(mdb MongoDBStatefulSe
dataVolumeClaim := statefulset.NOOP()
logVolumeClaim := statefulset.NOOP()
singleModeVolumeClaim := func(s *appsv1.StatefulSet) {}
if mdb.Persistent() {
if mdb.HasSeparateDataAndLogsVolumes() {
logVolumeMount := statefulset.CreateVolumeMount(logVolumeName, automationconfig.DefaultAgentLogPath)
dataVolumeMount := statefulset.CreateVolumeMount(dataVolumeName, "/data")
dataVolumeClaim = statefulset.WithVolumeClaim(dataVolumeName, dataPvc())
logVolumeClaim = statefulset.WithVolumeClaim(logVolumeName, logsPvc())
mongodbAgentVolumeMounts = append(mongodbAgentVolumeMounts, dataVolumeMount, logVolumeMount)
mongodVolumeMounts = append(mongodVolumeMounts, dataVolumeMount, logVolumeMount)
} else {
mounts := []corev1.VolumeMount{
statefulset.CreateVolumeMount(dataVolumeName, "/data", statefulset.WithSubPath("data")),
statefulset.CreateVolumeMount(dataVolumeName, automationconfig.DefaultAgentLogPath, statefulset.WithSubPath("logs")),
}
mongodbAgentVolumeMounts = append(mongodbAgentVolumeMounts, mounts...)
mongodVolumeMounts = append(mongodVolumeMounts, mounts...)
singleModeVolumeClaim = statefulset.WithVolumeClaim(dataVolumeName, dataPvc())
if mdb.HasSeparateDataAndLogsVolumes() {
logVolumeMount := statefulset.CreateVolumeMount(logVolumeName, automationconfig.DefaultAgentLogPath)
dataVolumeMount := statefulset.CreateVolumeMount(dataVolumeName, "/data")
dataVolumeClaim = statefulset.WithVolumeClaim(dataVolumeName, dataPvc())
logVolumeClaim = statefulset.WithVolumeClaim(logVolumeName, logsPvc())
mongodbAgentVolumeMounts = append(mongodbAgentVolumeMounts, dataVolumeMount, logVolumeMount)
mongodVolumeMounts = append(mongodVolumeMounts, dataVolumeMount, logVolumeMount)
} else {
mounts := []corev1.VolumeMount{
statefulset.CreateVolumeMount(dataVolumeName, "/data", statefulset.WithSubPath("data")),
statefulset.CreateVolumeMount(dataVolumeName, automationconfig.DefaultAgentLogPath, statefulset.WithSubPath("logs")),
}
mongodbAgentVolumeMounts = append(mongodbAgentVolumeMounts, mounts...)
mongodVolumeMounts = append(mongodVolumeMounts, mounts...)
singleModeVolumeClaim = statefulset.WithVolumeClaim(dataVolumeName, dataPvc())
}

podSecurityContext := podtemplatespec.NOOP()
Expand Down