kubedb · tamalsaha · Oct 13, 2023 · Oct 13, 2023
diff --git a/docs/examples/pgbouncer/custom-version/pgbouncer.yaml b/docs/examples/pgbouncer/custom-version/pgbouncer.yaml
@@ -15,5 +15,3 @@ spec:
   connectionPool:
     port: 2580
     reservePoolSize: 5
-  userListSecretRef:
-    name: db-user-pass
diff --git a/docs/examples/pgbouncer/monitoring/builtin-prom-pgbouncer.yaml b/docs/examples/pgbouncer/monitoring/builtin-prom-pgbouncer.yaml
@@ -15,10 +15,5 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-      - admin
-      - admin1
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/builtin
diff --git a/docs/examples/pgbouncer/monitoring/coreos-prom-pgbouncer.yaml b/docs/examples/pgbouncer/monitoring/coreos-prom-pgbouncer.yaml
@@ -15,11 +15,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-      - admin
-      - admin1
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/operator
     prometheus:

diff --git a/docs/examples/pgbouncer/pb-overview.yaml b/docs/examples/pgbouncer/pb-overview.yaml
@@ -20,11 +20,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-      - admin
-      - admin1
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/operator
     prometheus:

diff --git a/docs/examples/pgbouncer/private-registry/pvt-reg-pgbouncer.yaml b/docs/examples/pgbouncer/private-registry/pvt-reg-pgbouncer.yaml
@@ -14,8 +14,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-  userListSecretRef:
-    name: db-user-pass
   podTemplate:
     spec:
       imagePullSecrets:

diff --git a/docs/examples/pgbouncer/quickstart/pgbouncer-server-mod.yaml b/docs/examples/pgbouncer/quickstart/pgbouncer-server-mod.yaml
@@ -20,9 +20,4 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-      - admin
-      - admin1
-  userListSecretRef:
-    name: db-user-pass
   terminationPolicy: WipeOut
diff --git a/docs/examples/pgbouncer/quickstart/pgbouncer-server.yaml b/docs/examples/pgbouncer/quickstart/pgbouncer-server.yaml
@@ -15,9 +15,4 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-      - admin
-      - admin1
-  userListSecretRef:
-    name: db-user-pass
   terminationPolicy: WipeOut
diff --git a/docs/examples/proxysql/builtin-prom-proxysql.yaml b/docs/examples/proxysql/builtin-prom-proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: my-group
   monitor:

diff --git a/docs/examples/proxysql/coreos-prom-proxysql.yaml b/docs/examples/proxysql/coreos-prom-proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: my-group
   monitor:

diff --git a/docs/examples/proxysql/custom-proxysql.yaml b/docs/examples/proxysql/custom-proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: my-group
   configSecret:

diff --git a/docs/examples/proxysql/demo-proxy-my-group.yaml b/docs/examples/proxysql/demo-proxy-my-group.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: mysql-server
   terminationPolicy: WipeOut
diff --git a/docs/examples/proxysql/proxysql-private-registry.yaml b/docs/examples/proxysql/proxysql-private-registry.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: my-group
   podTemplate:

diff --git a/docs/guides/kafka/concepts/catalog.md b/docs/guides/kafka/concepts/catalog.md
@@ -50,6 +50,8 @@ spec:
   podSecurityPolicies:
     databasePolicyName: kafka-db
   version: 3.4.0
+  cruiseControl:
+    image: ghcr.io/kubedb/cruise-control:3.4.0
 ```
 
 ### metadata.name

diff --git a/docs/guides/pgbouncer/cli/cli.md b/docs/guides/pgbouncer/cli/cli.md
@@ -76,9 +76,6 @@ metadata:
   uid: 158b7c58-ecb2-4a77-bceb-081489b4921a
 spec:
   connectionPool:
-    adminUsers:
-    - admin
-    - admin1
     poolMode: session
     port: 5432
     reservePoolSize: 5
@@ -105,8 +102,6 @@ spec:
     spec:
       resources: {}
   replicas: 1
-  userListSecretRef:
-    name: db-user-pass
   version: 1.17.0
 status:
   observedGeneration: 1$6208915667192219204

diff --git a/docs/guides/pgbouncer/concepts/pgbouncer.md b/docs/guides/pgbouncer/concepts/pgbouncer.md
@@ -41,8 +41,6 @@ spec:
     databaseRef:
       name: "quick-postgres"
       namespace: demo
-    authSecretRef:
-      name: "one-specific-user"
   - alias: "tmpdb"
     databaseName: "mydb"
     databaseRef:
@@ -51,10 +49,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/operator
     prometheus:
@@ -156,12 +150,6 @@ ConnectionPool is used to configure pgbouncer connection-pool. All the fields he
 
 - `spec.connectionPool.IgnoreStartupParameters`: specifies comma-separated startup parameters that pgbouncer knows are handled by admin and it can ignore them.
 
-### spec.userListSecretRef:
-
-UserList field is used to specify a secret that contains the list of authorised users along with their passwords. Basically this secret is created from the standard pgbouncer userlist file.
-
-- `spec.userList.userListSecretRef.name`: specifies the name of the secret containing userlist. Has to be created in the same namespace as the PgBouncer crd.
-
 ### spec.monitor
 
 PgBouncer managed by KubeDB can be monitored with builtin-Prometheus and Prometheus operator out-of-the-box. To learn more,

diff --git a/docs/guides/pgbouncer/custom-versions/setup.md b/docs/guides/pgbouncer/custom-versions/setup.md
@@ -62,9 +62,6 @@ spec:
   version: "1.17.0"
   replicas: 1
   connectionPool:
-    adminUsers:
-    - admin
-    - admin1
     poolMode: session
     port: 5432
     reservePoolSize: 5
@@ -74,6 +71,4 @@ spec:
     databaseRef:
       name: quick-postgres
       namespace: demo
-  userListSecretRef:
-    name: db-user-pass
 ```
diff --git a/docs/guides/pgbouncer/monitoring/using-builtin-prometheus.md b/docs/guides/pgbouncer/monitoring/using-builtin-prometheus.md
@@ -62,11 +62,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-    - admin1
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/builtin
 ```

diff --git a/docs/guides/pgbouncer/monitoring/using-prometheus-operator.md b/docs/guides/pgbouncer/monitoring/using-prometheus-operator.md
@@ -122,11 +122,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-    - admin1
-  userListSecretRef:
-    name: db-user-pass
   monitor:
     agent: prometheus.io/operator
     prometheus:

diff --git a/docs/guides/pgbouncer/private-registry/using-private-registry.md b/docs/guides/pgbouncer/private-registry/using-private-registry.md
@@ -122,10 +122,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-  userListSecretRef:
-    name: db-user-pass
   podTemplate:
     spec:
       imagePullSecrets:

diff --git a/docs/guides/pgbouncer/quickstart/quickstart.md b/docs/guides/pgbouncer/quickstart/quickstart.md
@@ -174,11 +174,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-    - admin1
-  userListSecretRef:
-    name: db-user-pass
   terminationPolicy: Delete
 ```
 
@@ -188,7 +183,6 @@ Here,
 - `spec.replicas` specifies the number of replica pgbouncer server pods to be created for the PgBouncer object.
 - `spec.databases` specifies the databases that are going to be served via PgBouncer.
 - `spec.connectionPool` specifies the configurations for connection pool.
-- `spec.userListSecretRef` specifies the secret that contains the standard pgbouncer `userlist` file.
 - `spec.terminationPolicy` specifies what policy to apply while deletion.
 
 ### spec.databases
@@ -217,29 +211,6 @@ ConnectionPool is used to configure pgbouncer connection pool. All the fields he
 - `spec.connectionPool.maxDbConnections`: specifies the value of max_db_connections.
 - `spec.connectionPool.maxUserConnections`: specifies the value of max_user_connections.
 
-### spec.userListSecretRef
-
-UserList field is used to specify a secret that contains the list of authorized users along with their passwords. Basically this secret is created from the standard pgbouncer userlist file.
-
-- `spec.userListSecretRef.name`: specifies the name of the secret containing userlist in the same namespace as the PgBouncer crd.
-
-In this tutorial we will use a standard userlist text file to create a secret for spec.userListSecretRef. In the userlist text file we have added `pgbouncer` as user and  `ZFopeLnwkSf_f5Ys` as corresponding password. The file looks like this:
-
-```
-"postgres" "ZFopeLnwkSf_f5Ys"
-"myuser" "mypass"
-```
-
-We will need user `myuser` with password  `mypass` later in this tutorial.
-
-```bash
-$ wget https://raw.githubusercontent.com/kubedb/docs/{{< param "info.version" >}}/docs/examples/pgbouncer/quickstart/userlist
-
-2022-06-01 12:29:02 (1.02 MB/s) - ‘userlist’ saved [47/47]
-$ kubectl create secret generic -n demo db-user-pass --from-file=./userlist.txt
-
-secret/db-user-pass created
-```
 ### spec.terminationPolicy
 
 `terminationPolicy` gives flexibility whether to `nullify`(reject) the delete operation of `PgBouncer` crd or which resources KubeDB should keep or delete when you delete `PgBouncer` crd. KubeDB provides following four termination policies:
@@ -354,11 +325,6 @@ spec:
   connectionPool:
     maxClientConnections: 20
     reservePoolSize: 5
-    adminUsers:
-    - admin
-    - admin1
-  userListSecretRef:
-    name: db-user-pass
   terminationPolicy: Delete
 ```
 

diff --git a/docs/guides/proxysql/autoscaler/compute/cluster/examples/sample-proxysql.yaml b/docs/guides/proxysql/autoscaler/compute/cluster/examples/sample-proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   syncUsers: true

diff --git a/docs/guides/proxysql/autoscaler/compute/cluster/index.md b/docs/guides/proxysql/autoscaler/compute/cluster/index.md
@@ -94,7 +94,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   syncUsers: true

diff --git a/docs/guides/proxysql/clustering/proxysql-cluster/examples/sample-proxysql.yaml b/docs/guides/proxysql/clustering/proxysql-cluster/examples/sample-proxysql.yaml
@@ -4,9 +4,8 @@ metadata:
   name: proxy-server
   namespace: demo
 spec:
-  version: "2.3.2-debian"  
+  version: "2.3.2-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   terminationPolicy: WipeOut
diff --git a/docs/guides/proxysql/clustering/proxysql-cluster/index.md b/docs/guides/proxysql/clustering/proxysql-cluster/index.md
@@ -131,7 +131,6 @@ metadata:
 spec:
   version: "2.3.2-debian"  
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   terminationPolicy: WipeOut

diff --git a/docs/guides/proxysql/concepts/declarative-configuration/index.md b/docs/guides/proxysql/concepts/declarative-configuration/index.md
@@ -151,7 +151,6 @@ metadata:
 spec:
   version: "2.3.2-debian"  
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   initConfig:

diff --git a/docs/guides/proxysql/concepts/proxysql/index.md b/docs/guides/proxysql/concepts/proxysql/index.md
@@ -31,7 +31,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 1
-  mode: GroupReplication
   backend:
     name: my-group
   authSecret:

diff --git a/docs/guides/proxysql/custom-rbac/index.md b/docs/guides/proxysql/custom-rbac/index.md
@@ -144,7 +144,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 1
-  mode: Galera
   backend:
     name: xtradb-galera-appbinding
   syncUsers: true

diff --git a/docs/guides/proxysql/custom-rbac/yamls/my-custom-db.yaml b/docs/guides/proxysql/custom-rbac/yamls/my-custom-db.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 1
-  mode: Galera
   backend:
     name: xtradb-galera-appbinding
   syncUsers: true

diff --git a/docs/guides/proxysql/monitoring/builtin-prometheus/examples/proxysql.yaml b/docs/guides/proxysql/monitoring/builtin-prometheus/examples/proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-grp
   syncUsers: true

diff --git a/docs/guides/proxysql/monitoring/builtin-prometheus/index.md b/docs/guides/proxysql/monitoring/builtin-prometheus/index.md
@@ -84,7 +84,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-grp
   syncUsers: true

diff --git a/docs/guides/proxysql/monitoring/prometheus-operator/examples/proxysql.yaml b/docs/guides/proxysql/monitoring/prometheus-operator/examples/proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-grp
   syncUsers: true

diff --git a/docs/guides/proxysql/monitoring/prometheus-operator/index.md b/docs/guides/proxysql/monitoring/prometheus-operator/index.md
@@ -146,7 +146,6 @@ metadata:
 spec:
   version: "2.4.4-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-grp
   syncUsers: true

diff --git a/docs/guides/proxysql/reconfigure-tls/cluster/examples/sample-proxysql.yaml b/docs/guides/proxysql/reconfigure-tls/cluster/examples/sample-proxysql.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   version: "2.3.2-debian"
   replicas: 3
-  mode: GroupReplication
   backend:
     name: mysql-server
   syncUsers: true