Skip to content

feat: ability to merge nodeConf with data volume when it's not defined #1232

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

Open
husnialhamdani wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: ability to merge nodeConf with data volume when it's not defined #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b02dc
feat: ability to merge nodeConf with data volume when it's not defined
husnialhamdani Feb 1, 2025
f606ec5
Merge branch 'OT-CONTAINER-KIT:master' into merge-nodeconf-with-data-…
husnialhamdani Feb 2, 2025
7642029
Merge branch 'OT-CONTAINER-KIT:master' into merge-nodeconf-with-data-…
husnialhamdani Feb 3, 2025
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: 4 additions & 0 deletions pkg/k8sutils/redis-cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,13 @@ func generateRedisClusterParams(ctx context.Context, cr *redisv1beta2.RedisClust
}
if cr.Spec.Storage != nil {
res.PersistentVolumeClaim = cr.Spec.Storage.VolumeClaimTemplate
}

if cr.Spec.Storage != nil && cr.Spec.Storage.NodeConfVolume {
res.NodeConfVolume = cr.Spec.Storage.NodeConfVolume
res.NodeConfPersistentVolumeClaim = cr.Spec.Storage.NodeConfVolumeClaimTemplate
}

if externalConfig != nil {
res.ExternalConfig = externalConfig
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/k8sutils/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,14 @@ func getVolumeMount(name string, persistenceEnabled *bool, clusterMode bool, nod
})
}

// merge with the same volume of data if nodeConfVolume is disabled
if persistenceEnabled != nil && clusterMode && !nodeConfVolume {
VolumeMounts = append(VolumeMounts, corev1.VolumeMount{
Name: env.GetString(EnvOperatorSTSPVCTemplateName, name),
MountPath: "/node-conf",
})
}

if persistenceEnabled != nil && *persistenceEnabled {
VolumeMounts = append(VolumeMounts, corev1.VolumeMount{
Name: env.GetString(EnvOperatorSTSPVCTemplateName, name),
Expand Down
Loading