chart: sync files with conf dir

Author: PowerStateFailure

chart/postgres-operator/files/apiserver/pgorole

@@ -1,2 +1,2 @@
-pgoadmin: CreateDump, RestoreDump, ScaleCluster, CreateSchedule, DeleteSchedule, ShowSchedule, DeletePgbouncer, CreatePgbouncer, DeletePgpool, CreatePgpool, Restore, ShowSecrets, Reload, ShowConfig, Status, DfCluster, DeleteCluster, ShowCluster, CreateCluster, TestCluster, ShowBackup, DeleteBackup, CreateBackup, Label, Load, CreatePolicy, DeletePolicy, ShowPolicy, ApplyPolicy, ShowWorkflow, ShowPVC, CreateUpgrade, ShowUpgrade, DeleteUpgrade, CreateUser, DeleteUser, User, Version, CreateFailover, UpdateCluster
-pgoreader: Status, ShowConfig, DfCluster, ShowCluster, TestCluster, ShowBackup, ShowPolicy, ShowWorkflow, ShowPVC, ShowUpgrade, Version, ShowSchedule
+pgoadmin: CreateDump, RestoreDump, ScaleCluster, CreateSchedule, DeleteSchedule, ShowSchedule, DeletePgbouncer, CreatePgbouncer, DeletePgpool, CreatePgpool, Restore, ShowSecrets, Reload, ShowConfig, Status, DfCluster, DeleteCluster, ShowCluster, CreateCluster, TestCluster, ShowBackup, DeleteBackup, CreateBackup, Label, Load, CreatePolicy, DeletePolicy, ShowPolicy, ApplyPolicy, ShowWorkflow, ShowPVC, CreateUpgrade, ShowUpgrade, DeleteUpgrade, CreateUser, DeleteUser, User, Version, CreateFailover, UpdateCluster, CreateBenchmark, ShowBenchmark, DeleteBenchmark
+pgoreader: Status, ShowConfig, DfCluster, ShowCluster, TestCluster, ShowBackup, ShowPolicy, ShowWorkflow, ShowPVC, ShowUpgrade, Version, ShowSchedule, ShowBenchmark

chart/postgres-operator/files/postgres-operator/backrest-job.json

@@ -6,6 +6,7 @@
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
+                    "pgo-backrest-job": "true",
                     "pg-cluster": "{{.ClusterName}}"
                 }
     },
@@ -17,6 +18,7 @@
                 "labels": {
                     "vendor": "crunchydata",
                     "pgo-backrest": "true",
+                    "pgo-backrest-job": "true",
                     "pg-cluster": "{{.ClusterName}}"
                 }
             },

chart/postgres-operator/files/postgres-operator/cluster/1/cluster-deployment-1.json

@@ -69,6 +69,7 @@
                         "value": "{{.DataPathOverride}}"
                     }, {
 			{{.PgmonitorEnvVars}}
+			{{.PgbouncerEnvVars}}
 			{{.PgbackrestEnvVars}}
                         "name": "PG_DATABASE",
                         "value": "{{.Database}}"

chart/postgres-operator/files/postgres-operator/cluster/1/pgbouncer-template.json

@@ -5,6 +5,7 @@
         "name": "{{.Name}}",
         "labels": {
             "name": "{{.Name}}",
+            "crunchy-pgbouncer": "true",
             "pg-cluster": "{{.ClusterName}}",
             "service-name": "{{.Name}}"
         }
@@ -42,6 +43,9 @@
                     }, {
                         "name": "PG_REPLICA_SERVICE_NAME",
                         "value": "{{.ReplicaServiceName}}"
+                    },{
+                        "name": "PGBOUNCER_PASSWORD",
+                        "value": "{{.PgBouncerPass}}"
                     }],
                     "volumeMounts": [{
                         "name": "pgbouncer-conf",

chart/postgres-operator/files/postgres-operator/cluster/1/pgpool-template.json

@@ -6,6 +6,7 @@
         "labels": {
             "name": "{{.Name}}",
             "pg-cluster": "{{.ClusterName}}",
+            "crunchy-pgpool": "true",
             "service-name": "{{.Name}}"
         }
     },

chart/postgres-operator/files/postgres-operator/pgbench-job.json

@@ -0,0 +1,105 @@
+{
+    "apiVersion": "batch/v1",
+    "kind": "Job",
+    "metadata": {
+        "name": "{{.JobName}}",
+        "labels": {
+            "name": "{{.JobName}}",
+            "vendor": "crunchydata",
+            "pgo-benchmark": "true",
+            "pg-cluster": "{{.ClusterName}}",
+            "created": "{{.Created}}"
+        }
+    },
+    "spec": {
+        "backoffLimit": 0,
+        "template": {
+            "metadata": {
+                "name": "{{.JobName}}",
+                "labels": {
+                    "vendor": "crunchydata",
+                    "pgo-benchmark": "true",
+                    "pg-cluster": "{{.ClusterName}}",
+                    "created": "{{.Created}}"
+                }
+            },
+            "spec": {
+                "containers": [
+                    {
+                        "name": "pgbench",
+                        "image": "{{.CCPImagePrefix}}/crunchy-pgbench:{{.CCPImageTag}}",
+                        "env": [
+                            {
+                                "name": "PG_DATABASE",
+                                "value": "{{.PGDatabase}}"
+                            },
+                            {
+                                "name": "PG_HOSTNAME",
+                                "value": "{{.PGHost}}"
+                            },
+                            {
+                                "name": "PG_PORT",
+                                "value": "{{.PGPort}}"
+                            },
+                            {
+                                "name": "PG_PASSWORD",
+                                "valueFrom": {
+                                    "secretKeyRef": {
+                                        "name": "{{.PGUserSecret}}",
+                                        "key": "password"
+                                    }
+                                }
+                            },
+                            {
+                                "name": "PG_USERNAME",
+                                "valueFrom": {
+                                    "secretKeyRef": {
+                                        "name": "{{.PGUserSecret}}",
+                                        "key": "username"
+                                    }
+                                }
+                            },
+                            {
+                                "name": "PGBENCH_BENCHMARK_OPTS",
+                                "value": "{{.PGBenchOpts}}"
+                            },
+                            {
+                                "name": "PGBENCH_INIT_OPTS",
+                                "value": "{{.PGBenchInitOpts}}"
+                            },
+                            {
+                                "name": "PGBENCH_CLIENTS",
+                                "value": "{{.PGBenchClients}}"
+                            },
+                            {
+                                "name": "PGBENCH_JOBS",
+                                "value": "{{.PGBenchJobs}}"
+                            },
+                            {
+                                "name": "PGBENCH_SCALE",
+                                "value": "{{.PGBenchScale}}"
+                            },
+                            {
+                                "name": "PGBENCH_TRANSACTIONS",
+                                "value": "{{.PGBenchTransactions}}"
+                            }
+                        ],
+                        "volumeMounts": [
+                            {
+                                "mountPath": "/pgconf",
+                                "name": "pgconf-volume"
+                            }
+                        ]
+                    }
+                ],
+                "volumes": [
+                    {
+                        "name": "pgconf-volume",
+                        {{.PGBenchConfigMap}}
+                    }
+                ],
+                "restartPolicy": "Never"
+            }
+        }
+    }
+}

chart/postgres-operator/files/postgres-operator/pgo.lspvc-template.json

@@ -11,6 +11,9 @@
         }
     },
     "spec": {
+
+	    {{.NodeSelector}}
+
         "restartPolicy": "Never",
         "containers": [{
             "name": "lspvc",

chart/postgres-operator/files/postgres-operator/rmdata-job.json

@@ -2,25 +2,25 @@
     "apiVersion": "batch/v1",
     "kind": "Job",
     "metadata": {
-        "name": "rmdata-{{.Name}}",
+        "name": "{{.JobName}}",
 	"labels": {
         	"vendor": "crunchydata",
                	"pgrmdata": "true",
 		"pg-cluster": "{{.ClusterName}}",
-                "pg-database": "{{.Name}}",
+                "pg-database": "{{.ClusterName}}",
                 "claimName": "{{.PvcName}}"
 	}
     },
     "spec": {
 	"backoffLimit": 0,
         "template": {
             "metadata": {
-                "name": "rmdata-{{.Name}}",
+                "name": "{{.JobName}}",
                 "labels": {
                     "vendor": "crunchydata",
                     "pgrmdata": "true",
                     "pg-cluster": "{{.ClusterName}}",
-                    "pg-database": "{{.Name}}",
+                    "pg-database": "{{.ClusterName}}",
                     "claimName": "{{.PvcName}}"
                 }
             },