Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion pkg/cluster/k8sres.go
Original file line number Diff line number Diff line change
Expand Up @@ -881,11 +881,15 @@ func (c *Cluster) generatePodTemplate(
addEmptyDirVolume(&podSpec, "exporter-tmp", "postgres-exporter", "/tmp")
}

if c.OpConfig.ReadOnlyRootFilesystem != nil && *c.OpConfig.ReadOnlyRootFilesystem {
if c.OpConfig.ReadOnlyRootFilesystem != nil && *c.OpConfig.ReadOnlyRootFilesystem && !isRepoHost {
addRunVolume(&podSpec, "postgres-run", "postgres", "/run")
addEmptyDirVolume(&podSpec, "postgres-tmp", "postgres", "/tmp")
}

if c.OpConfig.ReadOnlyRootFilesystem != nil && *c.OpConfig.ReadOnlyRootFilesystem && isRepoHost {
addEmptyDirVolume(&podSpec, "pgbackrest-tmp", "pgbackrest", "/tmp")
}

if sharePgSocketWithSidecars != nil && *sharePgSocketWithSidecars {
addVarRunVolume(&podSpec)
}
Expand Down Expand Up @@ -1024,6 +1028,10 @@ func (c *Cluster) generateSpiloPodEnvVars(
envVars = append(envVars, v1.EnvVar{Name: "USE_PGBACKREST", Value: "true"})
}

if c.OpConfig.ReadOnlyRootFilesystem != nil && *c.OpConfig.ReadOnlyRootFilesystem {
envVars = append(envVars, v1.EnvVar{Name: "HOME", Value: "/home/postgres"})
}

if spec.TDE != nil && spec.TDE.Enable {
envVars = append(envVars, v1.EnvVar{Name: "TDE", Value: "true"})
// envVars = append(envVars, v1.EnvVar{Name: "PGENCRKEYCMD", Value: "/tmp/tde.sh"})
Expand Down Expand Up @@ -2250,6 +2258,13 @@ func addEmptyDirVolume(podSpec *v1.PodSpec, volumeName string, containerName str
podSpec.Containers[i].VolumeMounts = append(podSpec.Containers[i].VolumeMounts, mount)
}
}
if vol.Name == "postgres-tmp" && len(podSpec.InitContainers) > 0 {
for i := range podSpec.InitContainers {
if podSpec.InitContainers[i].Name == "pgbackrest-restore" {
podSpec.InitContainers[i].VolumeMounts = append(podSpec.InitContainers[i].VolumeMounts, mount)
}
}
}
}

func addRunVolume(podSpec *v1.PodSpec, volumeName string, containerName string, path string) {
Expand Down
12 changes: 9 additions & 3 deletions pkg/cluster/majorversionupgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (c *Cluster) majorVersionUpgrade() error {
return nil
}

pods, err := c.listPods()
pods, err := c.listPodsOfType(TYPE_POSTGRESQL)
if err != nil {
return err
}
Expand Down Expand Up @@ -213,7 +213,13 @@ func (c *Cluster) majorVersionUpgrade() error {
c.logger.Error("could not get members data from Patroni API, skipping major version upgrade")
return err
}
patroniVer, err := semver.NewVersion(patroniData.Patroni.Version)
patroniVersion := patroniData.Patroni.Version
parts := strings.Split(patroniVersion, ".")
if len(parts) > 3 {
patroniVersion = strings.Join(parts[:3], ".")
}
patroniVer, err := semver.NewVersion(patroniVersion)

if err != nil {
c.logger.Error("error parsing Patroni version")
patroniVer, _ = semver.NewVersion("3.0.4")
Expand All @@ -237,7 +243,7 @@ func (c *Cluster) majorVersionUpgrade() error {

isUpgradeSuccess := true
numberOfPods := len(pods)
if allRunning && masterPod != nil {
if allRunning {
c.logger.Infof("healthy cluster ready to upgrade, current: %d desired: %d", c.currentMajorVersion, desiredVersion)
if c.currentMajorVersion < desiredVersion {
defer func() error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ type Config struct {
MajorVersionUpgradeMode string `name:"major_version_upgrade_mode" default:"off"`
MajorVersionUpgradeTeamAllowList []string `name:"major_version_upgrade_team_allow_list" default:""`
MinimalMajorVersion string `name:"minimal_major_version" default:"13"`
TargetMajorVersion string `name:"target_major_version" default:"17"`
TargetMajorVersion string `name:"target_major_version" default:"18"`
PatroniAPICheckInterval time.Duration `name:"patroni_api_check_interval" default:"1s"`
PatroniAPICheckTimeout time.Duration `name:"patroni_api_check_timeout" default:"5s"`
EnablePatroniFailsafeMode *bool `name:"enable_patroni_failsafe_mode" default:"false"`
Expand Down
Loading