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

bring back CLONE_WAL_BUCKET_SCOPE_PREFIX

This commit is contained in:
Felix Kunde 2022-05-24 12:43:43 +02:00
parent 7c878f8aaa
commit be0db98167
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cluster/k8sres.go
View File

@ -1867,22 +1867,15 @@ func (c *Cluster) generateCloneEnvironment(description *acidv1.CloneDescription)
} else { } else {
c.logger.Debugf("use S3WalPath %s from the manifest", description.S3WalPath) c.logger.Debugf("use S3WalPath %s from the manifest", description.S3WalPath)
envs := []v1.EnvVar{ result = append(result, v1.EnvVar{
{
Name: "CLONE_WALE_S3_PREFIX", Name: "CLONE_WALE_S3_PREFIX",
Value: description.S3WalPath, Value: description.S3WalPath,
}, })
{
Name: "CLONE_WAL_BUCKET_SCOPE_SUFFIX",
Value: "",
},
}
result = append(result, envs...)
} }
result = append(result, v1.EnvVar{Name: "CLONE_METHOD", Value: "CLONE_WITH_WALE"}) result = append(result, v1.EnvVar{Name: "CLONE_METHOD", Value: "CLONE_WITH_WALE"})
result = append(result, v1.EnvVar{Name: "CLONE_TARGET_TIME", Value: description.EndTimestamp}) result = append(result, v1.EnvVar{Name: "CLONE_TARGET_TIME", Value: description.EndTimestamp})
result = append(result, v1.EnvVar{Name: "CLONE_WAL_BUCKET_SCOPE_PREFIX", Value: ""})
if description.S3Endpoint != "" { if description.S3Endpoint != "" {
result = append(result, v1.EnvVar{Name: "CLONE_AWS_ENDPOINT", Value: description.S3Endpoint}) result = append(result, v1.EnvVar{Name: "CLONE_AWS_ENDPOINT", Value: description.S3Endpoint})

8
pkg/cluster/k8sres_test.go
View File

@ -550,8 +550,8 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
envVarValue: "s3://another-bucket", envVarValue: "s3://another-bucket",
}, },
{ {
envIndex: 17, envIndex: 19,
envVarConstant: "CLONE_WAL_BUCKET_SCOPE_SUFFIX", envVarConstant: "CLONE_WAL_BUCKET_SCOPE_PREFIX",
envVarValue: "", envVarValue: "",
}, },
{ {
@ -572,14 +572,14 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
envVarValue: fmt.Sprintf("/%s", dummyUUID), envVarValue: fmt.Sprintf("/%s", dummyUUID),
}, },
{ {
envIndex: 20, envIndex: 21,
envVarConstant: "clone_aws_endpoint", envVarConstant: "clone_aws_endpoint",
envVarValue: "s3.eu-west-1.amazonaws.com", envVarValue: "s3.eu-west-1.amazonaws.com",
}, },
} }
expectedCloneEnvSecret := []ExpectedValue{ expectedCloneEnvSecret := []ExpectedValue{
{ {
envIndex: 20, envIndex: 21,
envVarConstant: "clone_aws_access_key_id", envVarConstant: "clone_aws_access_key_id",
envVarValueRef: &v1.EnvVarSource{ envVarValueRef: &v1.EnvVarSource{
SecretKeyRef: &v1.SecretKeySelector{ SecretKeyRef: &v1.SecretKeySelector{