Sync the backrest restore, collect, pgbouncer and

backrest repo templates in the Ansible installer
with those in the bash installer.  Also, sync the
pgo target role template in the bash installer with
the same template in the Ansible installer.  This
ensures all template are in sync between the bash
and Ansible installers.

Author: andrewlecuyer

ansible/roles/pgo-operator/files/pgo-configs/backrest-restore-job.json

@@ -86,7 +86,9 @@
                         }
                     }]
                 }],
+                "affinity": {
         {{.NodeSelector}}
+                },
                 "restartPolicy": "Never"
             }
         }

ansible/roles/pgo-operator/files/pgo-configs/collect.json

@@ -25,8 +25,7 @@
         {
             "name": "JOB_NAME",
             "value": "{{.JobName}}"
-        },
-        {
+        },{
             "name": "POSTGRES_EXPORTER_PORT",
             "value": "{{.ExporterPort}}"
         }

ansible/roles/pgo-operator/files/pgo-configs/pgbouncer-template.json

@@ -19,6 +19,7 @@
                 "crunchy-pgbouncer": "true",
                 "pg-cluster": "{{.ClusterName}}",
                 "service-name": "{{.Name}}",
+                "{{.PodAntiAffinityLabelName}}": "{{.PodAntiAffinityLabelValue}}",
                 "vendor": "crunchydata"
             }
         },
@@ -29,6 +30,7 @@
                     "crunchy-pgbouncer": "true",
                     "pg-cluster": "{{.ClusterName}}",
                     "service-name": "{{.Name}}",
+                    "{{.PodAntiAffinityLabelName}}": "{{.PodAntiAffinityLabelValue}}",
                     "vendor": "crunchydata"
                 }
             },

ansible/roles/pgo-operator/files/pgo-configs/pgo-backrest-repo-template.json

@@ -19,6 +19,7 @@
                     "pg-cluster": "{{.ClusterName}}",
                     "service-name": "{{.Name}}",
                     "vendor": "crunchydata",
+                    "{{.PodAntiAffinityLabelName}}": "{{.PodAntiAffinityLabelValue}}",
                     "pgo-backrest-repo": "true"
             }
         },
@@ -29,6 +30,7 @@
                     "pg-cluster": "{{.ClusterName}}",
                     "service-name": "{{.Name}}",
                     "vendor": "crunchydata",
+                    "{{.PodAntiAffinityLabelName}}": "{{.PodAntiAffinityLabelValue}}",
                     "pgo-backrest-repo": "true"
                 }
             },

conf/postgres-operator/pgo-target-role.json

@@ -74,17 +74,6 @@
             "verbs": [
                 "*"
             ]
-        },
-        {
-            "apiGroups": [
-                "apps"
-            ],
-            "resources": [
-                "deployments"
-            ],
-            "verbs": [
-                "patch"
-            ]
         }
     ]
 }