update helm chart to 3.3.0 baseline

Author: jmccormick2001

apiservermsgs/common.go

@@ -17,7 +17,7 @@ limitations under the License.
 
 import ()
 
-const PGO_VERSION = "3.3.0-rc4"
+const PGO_VERSION = "3.3.0"
 
 // Ok status
 const Ok = "ok"

chart/install-tiller-rbac.sh

@@ -0,0 +1,68 @@
+{
+    "kind": "Deployment",
+    "apiVersion": "extensions/v1beta1",
+    "metadata": {
+        "name": "{{.Name}}",
+        "labels": {
+            "name": "{{.Name}}",
+            "pg-cluster": "{{.ClusterName}}"
+        }
+    },
+    "spec": {
+        "replicas": 1,
+        "template": {
+            "metadata": {
+                "labels": {
+                    "name": "{{.Name}}",
+                    "crunchy-pgbouncer": "true",
+                    "pg-cluster": "{{.ClusterName}}"
+                }
+            },
+            "spec": {
+
+                "containers": [{
+                    "name": "pgbouncer",
+                    "image": "{{.CCPImagePrefix}}/crunchy-pgbouncer:{{.CCPImageTag}}",
+                    "ports": [{
+                        "containerPort": {{.Port}},
+                        "protocol": "TCP"
+                    }],
+                    "env": [{
+                        "name": "PG_USERNAME",
+                        "value": "testuser"
+                    }, {
+                        "name": "PG_PASSWORD",
+                        "value": "password"
+                    }, {
+                        "name": "PG_PRIMARY_SERVICE_NAME",
+                        "value": "{{.PrimaryServiceName}}"
+                    }, {
+                        "name": "PG_REPLICA_SERVICE_NAME",
+                        "value": "{{.ReplicaServiceName}}"
+                    }],
+                    "volumeMounts": [{
+                        "name": "pgbouncer-conf",
+                        "mountPath": "/pgconf/",
+                        "readOnly": false
+                    }]
+                }],
+                "volumes": [{
+                "name": "pgbouncer-conf",
+                "secret": {
+                    "secretName": "{{.SecretsName}}",
+                    "defaultMode": 511
+                    }
+                }],
+                "restartPolicy": "Always",
+                "dnsPolicy": "ClusterFirst"
+            }
+        },
+        "strategy": {
+            "type": "RollingUpdate",
+            "rollingUpdate": {
+                "maxUnavailable": 1,
+                "maxSurge": 1
+            }
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+[databases]
+{{.PG_PRIMARY_SERVICE_NAME}} = host={{.PG_PRIMARY_SERVICE_NAME}} port=5432 auth_user={{.PG_USERNAME}} dbname=userdb
+{{.PG_REPLICA_SERVICE_NAME}} = host={{.PG_REPLICA_SERVICE_NAME}} port=5432 auth_user={{.PG_USERNAME}} dbname=userdb
+
+[pgbouncer]
+listen_port = 5432
+listen_addr = *
+auth_type = md5
+auth_file = /pgconf/users.txt
+auth_query = SELECT username, password from pgbouncer.get_auth($1)
+pidfile = /tmp/pgbouncer.pid
+logfile = /dev/stdout
+admin_users = {{.PG_USERNAME}}
+stats_users = {{.PG_USERNAME}}
+default_pool_size = 20
+max_client_conn = 100
+max_db_connections = 0
+min_pool_size = 0
+pool_mode = session
+reserve_pool_size = 0
+reserve_pool_timeout = 5
+query_timeout = 0
+ignore_startup_parameters = extra_float_digits

chart/postgres-operator/files/postgres-operator/cluster/1/pgbouncer.ini

@@ -0,0 +1 @@
+host    all         all         0.0.0.0/0          md5

chart/postgres-operator/files/postgres-operator/cluster/1/pgbouncer_hba.conf

@@ -0,0 +1,2 @@
+{{range $key, $value := .}}"{{.Username}}" "{{.Password}}"
+{{end}}

chart/postgres-operator/files/postgres-operator/cluster/1/users.txt

@@ -36,7 +36,7 @@ Storage:
     AccessMode:  ReadWriteOnce
     Size:  1G
     StorageType:  dynamic
-    StorageClass:  fast
+    StorageClass:  rook-ceph-block
     Fsgroup:  26
 DefaultContainerResource: 
 ContainerResources:
@@ -56,4 +56,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-3.3.0-rc4
+  COImageTag:  centos7-3.3.0

conf/apiserver/pgo.yaml

@@ -25,8 +25,6 @@ import (
 	"strings"
 )
 
-//const PGO_VERSION = "3.2"
-
 type ClusterStruct struct {
 	CCPImagePrefix   string `yaml:"CCPImagePrefix"`
 	CCPImageTag      string `yaml:"CCPImageTag"`