Skip to content
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

#109 Add Folder to database volume definition #111

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#109 Add Folder to database volume definition #111

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
1 change: 1 addition & 0 deletions api/v1/kubegres_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type KubegresDatabase struct {
Size string `json:"size,omitempty"`
VolumeMount string `json:"volumeMount,omitempty"`
StorageClassName *string `json:"storageClassName,omitempty"`
Folder string `json:"folder,omitempty"`
}

type KubegresBackUp struct {
Expand Down
1 change: 1 addition & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions config/crd/bases/kubegres.reactive-tech.io_kubegres.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
type: string
database:
properties:
folder:
type: string
size:
type: string
storageClassName:
Expand Down
19 changes: 19 additions & 0 deletions controllers/spec/checker/SpecChecker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ func (r *SpecChecker) CheckSpec() (SpecCheckResult, error) {
r.kubegresContext.Kubegres.Spec.Database.VolumeMount = primaryVolumeMount
r.updateKubegresSpec("spec.database.volumeMount", primaryVolumeMount)
}
primaryFolder := r.GetEnv(primaryStatefulSetSpec.Template.Spec.Containers[0].Env, "PGDATA")[len(primaryVolumeMount)+1:]
if spec.Database.Folder != primaryFolder {
specCheckResult.HasSpecFatalError = true
specCheckResult.FatalErrorMessage = r.createErrMsgSpecCannotBeChanged("spec.database.folder",
primaryFolder, spec.Database.Folder,
"Otherwise, the cluster of PostgreSql servers risk of being inconsistent.")

r.kubegresContext.Kubegres.Spec.Database.Folder = primaryFolder
r.updateKubegresSpec("spec.database.folder", primaryFolder)
}

primaryStorageClassName := primaryStatefulSetSpec.VolumeClaimTemplates[0].Spec.StorageClassName
if *spec.Database.StorageClassName != *primaryStorageClassName {
Expand Down Expand Up @@ -343,3 +353,12 @@ func (r *SpecChecker) doesCurrentVolumeClaimTemplateExistInExpectedSpec(currentC
}
return false
}

func (r *SpecChecker) GetEnv(env []v1.EnvVar, envName string) string {
for _, envVar := range env {
if envVar.Name == envName {
return envVar.Value
}
}
return ""
}
5 changes: 5 additions & 0 deletions controllers/spec/defaultspec/UndefinedSpecValuesChecker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ func (r *UndefinedSpecValuesChecker) apply() error {
kubegresSpec.Database.VolumeMount = ctx.DefaultDatabaseVolumeMount
r.createLog("spec.database.volumeMount", kubegresSpec.Database.VolumeMount)
}
if kubegresSpec.Database.Folder == emptyStr {
wasSpecChanged = true
kubegresSpec.Database.Folder = ctx.DefaultDatabaseFolder
r.createLog("spec.database.folder", kubegresSpec.Database.Folder)
}

if kubegresSpec.CustomConfig == emptyStr {
wasSpecChanged = true
Expand Down
4 changes: 2 additions & 2 deletions controllers/spec/template/ResourcesCreatorFromTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (r *ResourcesCreatorFromTemplate) CreateReplicaStatefulSet(statefulSetInsta
initContainer.Image = postgresSpec.Image
initContainer.Env[0].Value = primaryServiceName
initContainer.Env[1].ValueFrom = r.getEnvVar(ctx.EnvVarNameOfPostgresReplicationUserPsw).ValueFrom
initContainer.Env[2].Value = postgresSpec.Database.VolumeMount + "/" + ctx.DefaultDatabaseFolder
initContainer.Env[2].Value = postgresSpec.Database.VolumeMount + "/" + postgresSpec.Database.Folder
initContainer.VolumeMounts[0].MountPath = postgresSpec.Database.VolumeMount

return statefulSetTemplate, nil
Expand Down Expand Up @@ -217,7 +217,7 @@ func (r *ResourcesCreatorFromTemplate) initStatefulSet(
container.Image = postgresSpec.Image
container.Ports[0].ContainerPort = postgresSpec.Port
container.VolumeMounts[0].MountPath = postgresSpec.Database.VolumeMount
container.Env = append(container.Env, core.EnvVar{Name: ctx.EnvVarNamePgData, Value: postgresSpec.Database.VolumeMount + "/" + ctx.DefaultDatabaseFolder})
container.Env = append(container.Env, core.EnvVar{Name: ctx.EnvVarNamePgData, Value: postgresSpec.Database.VolumeMount + "/" + postgresSpec.Database.Folder})
container.Env = append(container.Env, r.kubegresContext.Kubegres.Spec.Env...)

statefulSetTemplate.Spec.VolumeClaimTemplates[0].Spec.StorageClassName = postgresSpec.Database.StorageClassName
Expand Down