public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the Operator rolling update statefulsets unnecessary whien Kube API down (#2031) (#2064)

This commit is contained in:
machine424 2022-10-18 10:55:25 +02:00 committed by GitHub
parent 03ccb429ff
commit 640581fb46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cluster/k8sres.go
View File

@ -799,7 +799,7 @@ func (c *Cluster) generatePodTemplate(
func (c *Cluster) generateSpiloPodEnvVars( func (c *Cluster) generateSpiloPodEnvVars(
spec *acidv1.PostgresSpec, spec *acidv1.PostgresSpec,
uid types.UID, uid types.UID,
spiloConfiguration string) []v1.EnvVar { spiloConfiguration string) ([]v1.EnvVar, error) {
// hard-coded set of environment variables we need // hard-coded set of environment variables we need
// to guarantee core functionality of the operator // to guarantee core functionality of the operator
@ -922,7 +922,7 @@ func (c *Cluster) generateSpiloPodEnvVars(
// that will override all subsequent global variables // that will override all subsequent global variables
secretEnvVarsList, err := c.getPodEnvironmentSecretVariables() secretEnvVarsList, err := c.getPodEnvironmentSecretVariables()
if err != nil { if err != nil {
c.logger.Warningf("%v", err) return nil, err
} }
envVars = appendEnvVars(envVars, secretEnvVarsList...) envVars = appendEnvVars(envVars, secretEnvVarsList...)
@ -930,7 +930,7 @@ func (c *Cluster) generateSpiloPodEnvVars(
// that will override all subsequent global variables // that will override all subsequent global variables
configMapEnvVarsList, err := c.getPodEnvironmentConfigMapVariables() configMapEnvVarsList, err := c.getPodEnvironmentConfigMapVariables()
if err != nil { if err != nil {
c.logger.Warningf("%v", err) return nil, err
} }
envVars = appendEnvVars(envVars, configMapEnvVarsList...) envVars = appendEnvVars(envVars, configMapEnvVarsList...)
@ -966,7 +966,7 @@ func (c *Cluster) generateSpiloPodEnvVars(
envVars = appendEnvVars(envVars, opConfigEnvVars...) envVars = appendEnvVars(envVars, opConfigEnvVars...)
return envVars return envVars, nil
} }
func appendEnvVars(envs []v1.EnvVar, appEnv ...v1.EnvVar) []v1.EnvVar { func appendEnvVars(envs []v1.EnvVar, appEnv ...v1.EnvVar) []v1.EnvVar {
@ -1185,7 +1185,10 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
} }
// generate environment variables for the spilo container // generate environment variables for the spilo container
spiloEnvVars := c.generateSpiloPodEnvVars(spec, c.Postgresql.GetUID(), spiloConfiguration) spiloEnvVars, err := c.generateSpiloPodEnvVars(spec, c.Postgresql.GetUID(), spiloConfiguration)
if err != nil {
return nil, fmt.Errorf("could not generate Spilo env vars: %v", err)
}
// pickup the docker image for the spilo container // pickup the docker image for the spilo container
effectiveDockerImage := util.Coalesce(spec.DockerImage, c.OpConfig.DockerImage) effectiveDockerImage := util.Coalesce(spec.DockerImage, c.OpConfig.DockerImage)

3
pkg/cluster/k8sres_test.go
View File

@ -841,7 +841,8 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
pgsql.Spec.StandbyCluster = tt.standbyDescription pgsql.Spec.StandbyCluster = tt.standbyDescription
c.Postgresql = pgsql c.Postgresql = pgsql
actualEnvs := c.generateSpiloPodEnvVars(&pgsql.Spec, types.UID(dummyUUID), exampleSpiloConfig) actualEnvs, err := c.generateSpiloPodEnvVars(&pgsql.Spec, types.UID(dummyUUID), exampleSpiloConfig)
assert.NoError(t, err)
for _, ev := range tt.expectedValues { for _, ev := range tt.expectedValues {
env := actualEnvs[ev.envIndex] env := actualEnvs[ev.envIndex]