public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-09-30 16:12:07 +02:00
Code Issues Projects Releases Wiki Activity

pass additionalSecretMount to logical backup pod (#714)

Browse Source
This commit is contained in:
Felix Kunde
2019-11-19 18:06:55 +01:00
committed by GitHub
parent 63d1f3bbe4
commit 0b544ae43f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/k8sres.go
+4 -4
View File
@@ -493,7 +493,7 @@ func generatePodTemplate(
Spec: podSpec,
}
if kubeIAMRole != "" {
if template.Annotations == nil{
if template.Annotations == nil {
template.Annotations = make(map[string]string)
}
template.Annotations[constants.KubeIAmAnnotation] = kubeIAMRole
@@ -967,7 +967,7 @@ func (c *Cluster) generatePodAnnotations(spec *acidv1.PostgresSpec) map[string]s
annotations[k] = v
}
}
if len(annotations) == 0 {
return nil
}
@@ -1508,8 +1508,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
util.False(),
false,
"",
"",
""); err != nil {
c.OpConfig.AdditionalSecretMount,
c.OpConfig.AdditionalSecretMountPath); err != nil {
return nil, fmt.Errorf("could not generate pod template for logical backup pod: %v", err)
}