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

pass additionalSecretMount to logical backup pod

This commit is contained in:
Felix Kunde 2019-11-11 18:22:54 +01:00
parent 535517cd1b
commit 5b9c3d44e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cluster/k8sres.go
View File

@ -493,7 +493,7 @@ func generatePodTemplate(
Spec: podSpec, Spec: podSpec,
} }
if kubeIAMRole != "" { if kubeIAMRole != "" {
if template.Annotations == nil{ if template.Annotations == nil {
template.Annotations = make(map[string]string) template.Annotations = make(map[string]string)
} }
template.Annotations[constants.KubeIAmAnnotation] = kubeIAMRole template.Annotations[constants.KubeIAmAnnotation] = kubeIAMRole
@ -967,7 +967,7 @@ func (c *Cluster) generatePodAnnotations(spec *acidv1.PostgresSpec) map[string]s
annotations[k] = v annotations[k] = v
} }
} }
if len(annotations) == 0 { if len(annotations) == 0 {
return nil return nil
} }
@ -1508,8 +1508,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
util.False(), util.False(),
false, false,
"", "",
"", c.OpConfig.AdditionalSecretMount,
""); err != nil { c.OpConfig.AdditionalSecretMountPath); err != nil {
return nil, fmt.Errorf("could not generate pod template for logical backup pod: %v", err) return nil, fmt.Errorf("could not generate pod template for logical backup pod: %v", err)
} }