public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-06 02:53:54 +02:00
Code Issues Projects Releases Wiki Activity

merge with master and resolve conflict

Browse Source
This commit is contained in:
Felix Kunde
2020-02-20 10:09:13 +01:00
parent 2afaa59719 742d7334a1
commit cf85db5d7a
43 changed files with 612 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/k8sres.go
+2 -2
View File
@@ -1559,8 +1559,8 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
)
labels := map[string]string{
"version": c.Name,
"application": "spilo-logical-backup",
c.OpConfig.ClusterNameLabel: c.Name,
"application": "spilo-logical-backup",
}
podAffinityTerm := v1.PodAffinityTerm{
LabelSelector: &metav1.LabelSelector{