26.04 docs release

.github/workflows/automatic-doc-checks.yml

@@ -5,13 +5,11 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    paths:
-      - 'docs/**'   # Only run on changes to the docs directory
 
-  workflow_call:
   workflow_dispatch:
     # Manual trigger
 
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -21,4 +19,4 @@ jobs:
     uses: canonical/documentation-workflows/.github/workflows/documentation-checks.yaml@main
     with:
       working-directory: "docs"
-      fetch-depth: 0
+      fetch-depth: 0

.github/workflows/markdown-style-checks.yml

@@ -1,28 +1,20 @@
 name: Markdown style checks
 
 on:
-  workflow_call:
   push:
     branches:
     - main
-    paths:
-    - 'docs/**'   # Only run on changes to the docs directory
   pull_request:
     branches:
     - '*'
-    paths:
-    - 'docs/**'   # Only run on changes to the docs directory
 
 jobs:
   markdown-lint:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Create venv
-      working-directory: "docs"
-      run: make install
-    - name: Lint markdown
-      working-directory: "docs"
-      run: make lint-md
+    - uses: DavidAnson/markdownlint-cli2-action@v16
+      with:
+        config: ".sphinx/.markdownlint.json"

docs/.custom_wordlist.txt

@@ -50,6 +50,7 @@ ceph
 Certbot
 certbot
 centralized
+cfg
 Charmhub
 Charmhub's
 changelog
@@ -64,7 +65,11 @@ CLI's
 Cognito
 conf
 config
+configurator
+configurators
+Configurator
 configs
+Configurator
 conformant
 conntrack
 copiedprofilename
@@ -104,8 +109,10 @@ Entra
 EPMD
 epoll
 ESM
+FDE
 eu
 falsy
+FDERecoveryKeyManager
 Fernet
 FIPS
 FQDN
@@ -125,6 +132,7 @@ grpcio
 filesystem
 frontend
 HAProxy
+haproxy
 HashiCorp
 hardcoded
 HashiCorp’s
@@ -149,7 +157,9 @@ init
 IoT
 Iot
 ip
+IPs
 IPv
+Jinja
 jQuery
 Juju's
 Juju
@@ -164,15 +174,19 @@ keyslots
 Kudu
 KVM
 keyrings
+keyslot
 kvm
 kwarg
 labelled
 launchpadcontent
+lbaas
+LBaaS
 LDAP
 LDS
 LetsEncrypt
 libvirt
 licence
+lego
 lifecycle
 Livepatch
 Livepatches
@@ -187,6 +201,7 @@ LXD
 lxd
 MAAS
 maas
+maxconn
 Mailjet
 Makefile
 ManualInstallation
@@ -242,16 +257,20 @@ queueingQuickstartquickstart
 packagesearch
 PAYG
 PCI
+pem
 perf
 perfs
 performant
+PID
 PIDs
 PITR
 pgSQL
 pgtune
 pingserver
 pluggable
 png
+pooler
+poolers
 Postconf
 postgres
 PostgreSQL
@@ -339,6 +358,8 @@ timeframe
 TLD
 TLS
 TLSv
+tmpfiles
+TPM
 traceback
 transactional
 truthy

docs/conf.py

@@ -245,7 +245,8 @@
     "sphinx_last_updated_by_git",
     "sphinx.ext.intersphinx",
     "sphinx_sitemap",
-    "sphinxext.rediraffe"
+    "sphinxext.rediraffe",
+    "sphinxcontrib.mermaid",
 ]
 
 
@@ -334,7 +335,7 @@
 rediraffe_branch = "main"
 rediraffe_redirects = "redirects.txt"
 
-## Reredirects extension 
+## Reredirects extension
 ## NOTE: We've moved to use rediraffe as our main redirects extension.
 ## The following are ones we already had in place, but haven't migrated
 redirects = {
@@ -344,4 +345,4 @@
     'how-to-guides/security/install-landscape-in-an-air-gapped-or-offline-environment': '../../landscape-installation-and-set-up/install-landscape-in-an-air-gapped-or-offline-environment',
     'explanation/repository-mirroring/repository-mirroring': '../../features/repository-mirroring',
     'reference/known-issues/known-issues': '../../known-issues'
-}
+}

docs/explanation/charm/charm-compatibility.md

@@ -8,38 +8,136 @@ myst:
 
 # Landscape Server charm integration compatibility
 
-The [Landscape Server charm](https://charmhub.io/landscape-server) can be deployed with Juju when integrated with at least the following charms:
+The [Landscape Server charm](https://charmhub.io/landscape-server) requires integration with the following charms, depending on the version:
 
-- `haproxy`
+**All versions:**
 - `postgresql`
 - `rabbitmq-server`
 
-For a recommended charm bundle configuration and more information about deploying Landscape Server with Juju, see {ref}`How to install Landscape Server with Juju <how-to-juju-installation>`.
+**Landscape 26.04 LTS beta+:**
+- `haproxy` (at `2.8/edge`, via `haproxy-route` interface)
+- A TLS certificates provider integrated with HAProxy (e.g., `self-signed-certificates`, `lego`)
 
-Compatibility with a Landscape Server charm revision is limited to specific revisions and channels of the required charms. Incompatibility can occur if the charm’s base (e.g., `ubuntu@24.04`), architecture (e.g., `amd64`), or interfaces change.
+**Before Landscape 26.04:**
+- `haproxy` (via `reverseproxy` interface)
+
+For a recommended charm bundle configuration and more information about deploying Landscape Server with Juju, see {ref}`how-to-juju-installation` and {ref}`how-to-juju-ha-installation`.
+
+Compatibility with a Landscape Server charm revision is limited to specific revisions and channels of the required charms. Incompatibility can occur if the charm's base (e.g., `ubuntu@24.04`), architecture (e.g., `amd64`), or interfaces change.
 
 ```{tip}
 Learn more about [Juju integrations](https://canonical.com/juju/integrations).
 ```
 
+## Deployment architectures
+
+The Landscape Server charm supports two deployment architectures:
+
+**Landscape 26.04 LTS beta+ (recommended):**
+- External HAProxy charm (`2.8/edge`) for load balancing, using the `haproxy-route` interface
+- PostgreSQL 14+ with modern `database` interface
+- TLS certificates via a `tls-certificates` interface provider integrated with HAProxy
+
+```{include} /reuse/charm-ha-architecture-2604.md
+```
+
+**Before 26.04:**
+- External HAProxy charm for load balancing, using the `reverseproxy` interface
+- PostgreSQL ≥ 14 with legacy `pgsql` interface
+
+```{include} /reuse/charm-ha-architecture-pre-2604.md
+```
+
+For migration from older deployments to 26.04 beta+, see {ref}`how-to-migrate-to-26-04-charm`.
+
+## Required integrations by version
+
+| Charm                         | Landscape 26.04 LTS beta+                                            | Before 26.04                                    |
+| ----------------------------- | -------------------------------------------------------------------- | ----------------------------------------------- |
+| **PostgreSQL**                | Required (PostgreSQL 14+, `database` interface)                      | Required (PostgreSQL 14, `pgsql` interface)     |
+| **RabbitMQ Server**           | Required                                                             | Required                                        |
+| **HAProxy**                   | Required (`2.8/x`, `haproxy-route` interface)                        | Required (`latest/x`, `reverseproxy` interface) |
+| **TLS Certificates Provider** | Required (integrated with HAProxy, e.g., `self-signed-certificates`) | Not used                                        |
+
+## TLS certificates charm interface
+
+Starting with the 26.04 beta version, TLS is managed by the HAProxy charm. The HAProxy charm integrates with a provider of the [`tls-certificates` charm interface](https://charmhub.io/integrations/tls-certificates) to obtain certificates for HTTPS connections.
+
+### Available TLS certificate providers
+
+**For testing/development:**
+- [`self-signed-certificates`](https://charmhub.io/self-signed-certificates) - Generates self-signed certificates (not trusted by browsers/clients)
+
+**For production:**
+- [`lego`](https://charmhub.io/lego) - Obtains certificates from Let's Encrypt or other ACME providers
+- [`manual-tls-certificates`](https://charmhub.io/manual-tls-certificates) - Use custom CA certificates
+- Any charm that provides the `tls-certificates` interface
+
+Integrate TLS with HAProxy (not with `landscape-server` directly):
+
+```bash
+juju integrate haproxy:certificates <tls-provider>:certificates
+```
+
+For deployment examples and configuration, see {ref}`how-to-juju-ha-installation` and {ref}`how-to-migrate-to-26-04-charm`.
+
 ## K8s Operators
 
 Landscape Server is currently only distributed as a machine (VM) charm and cannot be directly integrated with any version of K8s Charmed Operators, such as the HAProxy K8s operator or the Charmed PostgreSQL K8s operator.
 
 ## HAProxy
 
-The Landscape Server charm can be integrated to any of the `latest/x` channels of the HAProxy charm. However, it cannot yet be related to any of the `2.8/x` channels of the HAProxy charm due to a complete rewrite of the charm and its interfaces.
+The relationship between Landscape Server and HAProxy varies significantly between Landscape versions:
+
+**Landscape 26.04 LTS beta+:**
+- Requires the HAProxy charm at `2.8/edge`
+- Integrates via 8 `haproxy-route` relation endpoints directly from landscape-server to haproxy
+- HAProxy handles TLS termination and load balancing
+- Cannot be integrated with the `latest/x` channels of the HAProxy charm (different interface)
+
+**Before 26.04:**
+- Requires the external HAProxy charm at `latest/x`
+- Integrates via the `reverseproxy` interface: `landscape-server:website` → `haproxy:reverseproxy`
+- Cannot be integrated with the `2.8/x` channels of the HAProxy charm
+
+**LBaaS (Load Balancer as a Service) - cross-model HAProxy:**
+- Deploy HAProxy in a separate Juju model and use cross-model relations
+- Landscape Server integrates directly with the cross-model HAProxy via `haproxy-route` endpoints
+- See {ref}`heading-lbaas-installation` for complete setup
+
+For migrating from older deployments to the new HAProxy architecture, see {ref}`how-to-migrate-to-26-04-charm`.
 
 - [HAProxy on Charmhub](https://charmhub.io/haproxy)
 
 ## Charmed PostgreSQL
 
-The Landscape Server charm can be integrated to any of the `latest/x` or `14/x` channels of the PostgreSQL charm. However, it cannot yet be related to any of the `16/x` channels of the PostgreSQL charm due to the charm interface being restructured.
+PostgreSQL charm compatibility varies by Landscape Server version:
+
+**Landscape 26.04 LTS beta+:**
+- Compatible with PostgreSQL 14+ using the modern `database` interface
+- Landscape Server integrates using the `database` relation endpoint: `landscape-server:database` → `postgresql:database`
+- It is recommended to use PostgreSQL 16 for new deployments
+- Supports [PgBouncer](https://charmhub.io/pgbouncer) as a connection pooler via the `database` relation endpoint; see {ref}`explanation-pgbouncer-integration`
+
+**Before 26.04:**
+- Compatible with PostgreSQL 14 using the legacy `pgsql` interface
+- Landscape Server integrates using the `db` relation endpoint: `landscape-server:db` → `postgresql:db-admin`
+- Cannot use PostgreSQL 16 due to interface incompatibility
 
 - [Charmed PostgreSQL VM on Charmhub](https://charmhub.io/postgresql)
 
 ## RabbitMQ Server
 
-There are no charm integration incompatibilities between the Landscape Server charm and the RabbitMQ Server charm.
+RabbitMQ Server integration varies by Landscape Server version:
+
+**Landscape 25.10+:**
+- Uses separate inbound and outbound AMQP relation endpoints
+- Relations:
+  - `landscape-server:inbound-amqp` ↔ `rabbitmq-server`
+  - `landscape-server:outbound-amqp` ↔ `rabbitmq-server`
+
+**Before 25.10:**
+- Uses a single `amqp` relation endpoint
+- Relation: `landscape-server:amqp` ↔ `rabbitmq-server:amqp`
 
 - [RabbitMQ Server on Charmhub](https://charmhub.io/rabbitmq-server)