feat: remove-pgbouncer and upgrade MAAS to 3.5

README.md

@@ -134,6 +134,5 @@ And `juju login` as usual.
 - MAAS Region: <https://charmhub.io/maas-region>
 - MAAS Region: <https://charmhub.io/maas-agent>
 - PostgreSQL: <https://charmhub.io/postgresql>
-- PgBouncer: <https://charmhub.io/pgbouncer>
 - HAProxy: <https://charmhub.io/haproxy>
 - Keepalived: <https://charmhub.io/keepalived>

anvil-python/anvil/commands/maas_region.py

@@ -76,7 +76,7 @@ def extra_tfvars(self) -> dict[str, Any]:
         haproxy_vars: dict[str, Any] = questions.load_answers(
             self.client, HAPROXY_CONFIG_KEY
         )
-        if enable_haproxy and "ssl_cert" in haproxy_vars:
+        if enable_haproxy and haproxy_vars.get("ssl_cert", "") != "":
             variables["tls_mode"] = "termination"
         return variables
 

anvil-python/anvil/commands/upgrades/inter_channel.py

@@ -198,7 +198,7 @@ def __init__(
             jhelper,
             manifest,
             model,
-            ["maas-region", "pgbouncer"],
+            ["maas-region"],
             "maas-region-plan",
             MAASREGION_CONFIG_KEY,
             MAASREGION_UNIT_TIMEOUT,

anvil-python/anvil/versions.py

@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MAAS_REGION_CHANNEL = "3.4/edge"
-MAAS_AGENT_CHANNEL = "3.4/edge"
+MAAS_REGION_CHANNEL = "3.5/edge"
+MAAS_AGENT_CHANNEL = "3.5/edge"
 POSTGRESQL_CHANNEL = "14/stable"
-PGBOUNCER_CHANNEL = "1/stable"
 HAPROXY_CHANNEL = "latest/stable"
 KEEPALIVED_CHANNEL = "latest/stable"
 
@@ -25,7 +24,6 @@
     "maas-agent": MAAS_AGENT_CHANNEL,
     "haproxy": HAPROXY_CHANNEL,
     "postgresql": POSTGRESQL_CHANNEL,
-    "pgbouncer": PGBOUNCER_CHANNEL,
     "keepalived": KEEPALIVED_CHANNEL,
 }
 K8S_CHARMS: dict[str, str] = {}
@@ -48,11 +46,6 @@
             "revision": "charm_maas_region_revision",
             "config": "charm_maas_region_config",
         },
-        "pgbouncer": {
-            "channel": "charm_pgbouncer_channel",
-            "revision": "charm_pgbouncer_revision",
-            "config": "charm_pgbouncer_config",
-        },
     }
 }
 

cloud/etc/deploy-maas-region/main.tf

@@ -52,39 +52,7 @@ resource "juju_application" "maas-region" {
   )
 }
 
-resource "juju_application" "pgbouncer" {
-  name  = "pgbouncer"
-  model = data.juju_model.machine_model.name
-  units = 0 # it is a subordinate charm
-
-  charm {
-    name     = "pgbouncer"
-    channel  = var.charm_pgbouncer_channel
-    revision = var.charm_pgbouncer_revision
-    base     = "ubuntu@22.04"
-  }
-
-  config = merge({
-    pool_mode          = "session"
-    max_db_connections = var.max_connections_per_region
-  }, var.charm_pgbouncer_config)
-}
-
-resource "juju_integration" "postgresql-pgbouncer" {
-  model = data.juju_model.machine_model.name
-
-  application {
-    name     = "postgresql"
-    endpoint = "database"
-  }
-
-  application {
-    name     = juju_application.pgbouncer.name
-    endpoint = "backend-database"
-  }
-}
-
-resource "juju_integration" "maas-region-pgbouncer" {
+resource "juju_integration" "maas-region-postgresql" {
   model = data.juju_model.machine_model.name
 
   application {
@@ -93,7 +61,7 @@ resource "juju_integration" "maas-region-pgbouncer" {
   }
 
   application {
-    name     = juju_application.pgbouncer.name
+    name     = "postgresql"
     endpoint = "database"
   }
 }

cloud/etc/deploy-maas-region/variables.tf

@@ -48,32 +48,8 @@ variable "enable_haproxy" {
   default     = false
 }
 
-variable "charm_pgbouncer_channel" {
-  description = "Operator channel for PgBouncer deployment"
-  type        = string
-  default     = "1/stable"
-}
-
-variable "charm_pgbouncer_revision" {
-  description = "Operator channel revision for PgBouncer deployment"
-  type        = number
-  default     = null
-}
-
-variable "charm_pgbouncer_config" {
-  description = "Operator config for PgBouncer deployment"
-  type        = map(string)
-  default     = {}
-}
-
-variable "max_connections_per_region" {
-  description = "Maximum number of concurrent connections to allow to the database server per region"
-  type        = number
-  default     = 50
-}
-
 variable "tls_mode" {
   description = "TLS Mode for MAAS Region charm ('', 'termination', or 'passthrough')"
   type        = string
   default     = ""
-}
+}