pass additionalSecretMount to logical backup pod (zalando#714)

FxKu · web-flow · commit 0b544ae43f20 · 2019-11-19T18:06:55.000+01:00
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
@@ -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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func generatePodTemplate(`
`493`	`493`	`Spec: podSpec,`
`494`	`494`	`}`
`495`	`495`	`if kubeIAMRole != "" {`
`496`		`- if template.Annotations == nil{`
	`496`	`+ if template.Annotations == nil {`
`497`	`497`	`template.Annotations = make(map[string]string)`
`498`	`498`	`}`
`499`	`499`	`template.Annotations[constants.KubeIAmAnnotation] = kubeIAMRole`
`@@ -967,7 +967,7 @@ func (c Cluster) generatePodAnnotations(spec acidv1.PostgresSpec) map[string]s`
`967`	`967`	`annotations[k] = v`
`968`	`968`	`}`
`969`	`969`	`}`
`970`		`-`
	`970`	`+`
`971`	`971`	`if len(annotations) == 0 {`
`972`	`972`	`return nil`
`973`	`973`	`}`
`@@ -1508,8 +1508,8 @@ func (c Cluster) generateLogicalBackupJob() (batchv1beta1.CronJob, error) {`
`1508`	`1508`	`util.False(),`
`1509`	`1509`	`false,`
`1510`	`1510`	`"",`
`1511`		`- "",`
`1512`		`- ""); err != nil {`
	`1511`	`+ c.OpConfig.AdditionalSecretMount,`
	`1512`	`+ c.OpConfig.AdditionalSecretMountPath); err != nil {`
`1513`	`1513`	`return nil, fmt.Errorf("could not generate pod template for logical backup pod: %v", err)`
`1514`	`1514`	`}`
`1515`	`1515`