Umbrella issue #915 (D1 sub-task). Aligns the chart's post-install OIDC config Job with the canonical wp-cli flow and the bp-keycloak tenant- realm contract C1's PR #918 ships. Chart 0.2.0 ----------- - templates/oidc-config-job.yaml rewritten to use the official wordpress:cli-2.12.0-php8.3 image (manifest-list digest pinned per Inviolable Principle #4). Replaces direct PHP/SQL UPSERTs against wp_options with: * wp core install (idempotent: wp core is-installed) * wp plugin install openid-connect-generic --activate (idempotent: wp plugin is-installed) * wp option update openid_connect_generic_settings <json> * wp option update default_role * wp theme install/activate * wp option update siteurl/home Going through wp-cli (i.e. WordPress core's own PHP API) is more resilient than schema-shape-dependent INSERT statements and survives WordPress minor upgrades. - values.yaml: new canonical oidc.* block — oidc.{enabled, issuerURL, clientId, clientSecretName, defaultRole, identityKey, roleMapping, cliImage}. Default oidc.clientSecretName = "wordpress-oidc-client-secret" matches the K8s Secret bp-keycloak's PR #918 emits alongside the realm import ConfigMap (so the realm JSON's `secret` field and the Secret bytes never drift). - Legacy keycloak.{realmURL, clientID, clientSecretName} kept as a back-compat alias. _helpers.tpl folds it into oidc.* when the modern keys are at their values.yaml defaults so chart 0.1.x clusters keep reconciling. Removed in chart 0.3.0. - oidc.defaultRole=subscriber — newly auto-created SSO users land with subscriber capability (operator overrides via overlay). - Redirect URIs: the openid-connect-generic plugin's default callback is /wp-admin/admin-ajax.php?action=openid-connect-authorize when alternate_redirect_uri=0 (we set 0). bp-keycloak (PR #918) registers the same URL plus /wp-login.php and a /* wildcard, so the client's allowed-redirect-URI list aligns with what the plugin actually issues. Orchestrator emit ----------------- - products/catalyst/bootstrap/api/internal/handler/sme_tenant_gitops.go smeTenantBPWordPress now emits the canonical oidc.* block AND the legacy keycloak.* alias (for chart 0.1.x clusters mid-upgrade). Tests ----- - chart/tests/oidc-config.sh — 7 helm-template assertions: 1. Canonical oidc.* render produces a Job with the required wp-cli command flow + wordpress:cli-2.12.0-php8.3 image. 2. Legacy keycloak.* fold path (chart 0.1.x compat). 3. oidc.enabled=false short-circuits the Job. 4. alternate_redirect_uri=0 (so plugin URL matches the realm- registered redirect URI from PR #918). 5. defaultRole rendered + propagated. 6. Render YAML is parseable and contains all required kinds. 7. wp-content PVC mounted in the Job (so pg4wp's db.php drop-in loads — failure here would silently fall back to mysqli). - internal/handler/sme_tenant_test.go: * TestRenderSMETenantOverlay_WordPressEmitsOIDC — pins the canonical oidc.* block + legacy keycloak.* alias the orchestrator emits for the alice@omantel test fixture. * TestRenderSMETenantOverlay_WordPressOIDC_BYOMode — BYO domain mode renders wordpress.<byo-domain> as the ingress host. Verification ------------ - helm lint clean - helm template smoke green for: oidc.* canonical, keycloak.* legacy fold, oidc.enabled=false short-circuit - chart/tests/oidc-config.sh: 7/7 PASS - chart/tests/observability-toggle.sh: 2/2 PASS (regression) - go test ./internal/handler/ -run "SMETenant|TestRenderSME": all green (TestAuthHandover_HappyPath failure is pre-existing on main, unrelated to this change) Closes (D1 sub-task) of #915. Co-authored-by: hatiyildiz <hatice@openova.io> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| templates | ||
| tests | ||
| Chart.yaml | ||
| README.md | ||
| values.yaml | ||
bp-wordpress-tenant
Catalyst Blueprint scratch chart that installs a turnkey, SSO-pre-wired WordPress instance per SME tenant inside the SME's vcluster.
This is a scratch chart — there is no first-party Helm chart
published by the WordPress project (the upstream ships only a Docker
image at wordpress:6-php8.3-apache). The common library subchart is
declared as a Helm dependency so the BLUEPRINT-AUTHORING.md hollow-
chart guard (issue #181) is satisfied; bp-newapi follows the same
pattern.
What it provisions
| Resource | Purpose |
|---|---|
Deployment (single replica) |
The WordPress Pod. Two initContainers: one seeds wp-content/ from the image onto the PVC; the other downloads + installs openid-connect-generic (Keycloak SSO) and pg4wp (Postgres adapter) from wordpress.org / GitHub. |
Service (ClusterIP, :80) |
In-vcluster service for the ingress to target. |
Ingress (Traefik, host wordpress.<smeDomain>) |
Customer-facing entry point. cert-manager issues TLS via the operator-supplied ClusterIssuer. |
PersistentVolumeClaim (10Gi default, RWO) |
Backs /var/www/html/wp-content so themes, plugins, and uploads persist across pod restarts and image upgrades. helm.sh/resource-policy: keep so helm uninstall never drops customer content. |
Cluster.postgresql.cnpg.io (1 instance, 10Gi) |
Tenant-isolated Postgres provisioned by bp-cnpg. The CNPG-emitted <cluster>-app Secret carries the password. |
Secret wordpress-database-secret (placeholder) |
Reflector-managed bridge that the WordPress Pod reads via secretKeyRef. Populated by the post-install db-secret-sync Job. |
Job <release>-db-secret-sync (post-install/upgrade) |
Mirrors <cluster>-app.password into wordpress-database-secret.password. Eliminates the otech30-class Reflector race documented in bp-gitea. |
Job <release>-oidc-config (post-install/upgrade) |
Runs the canonical wordpress:cli image: wp core install (idempotent), wp plugin install openid-connect-generic --activate (idempotent), wp option update openid_connect_generic_settings <json> with the per-tenant Keycloak realm + client + secret, wp option update default_role, wp theme activate, wp option update siteurl/home. Idempotent — re-running on helm upgrade is safe. |
Job <release>-admin-user (post-install/upgrade, hook weight 15) |
Pre-seeds the SME admin into wp_users + wp_usermeta with the administrator role + the SSO email mapping. The user can log in via Keycloak only. |
NetworkPolicy |
Restricts egress to: bp-cnpg :5432, Keycloak :8443/:8080, kube-dns, and HTTPS to public IPs (for plugin/theme fetches at first install). Ingress allowed only from the configured ingress namespace (default traefik). |
ServiceAccount |
Default SA for the WordPress Pod. The post-install Jobs use a dedicated SA + Role + RoleBinding scoped to the tenant namespace. |
Boot sequence (per docs/INVIOLABLE-PRINCIPLES.md #2)
helm install
├─ pre-install: namespace, ServiceAccount, Role/RoleBinding hooks (weight 0)
├─ install: Deployment, Service, Ingress, PVC, NetworkPolicy,
│ Cluster.postgresql.cnpg.io, wordpress-database-secret (empty)
├─ post-install hook weight 5: db-secret-sync Job
│ └─ waits for CNPG <cluster>-app, PATCHes wordpress-database-secret
├─ post-install hook weight 10: oidc-config Job (wp-cli)
│ └─ wp core install, wp plugin install openid-connect-generic
│ --activate, wp option update openid_connect_generic_settings,
│ wp theme activate, wp option update siteurl/home
└─ post-install hook weight 15: admin-user Job
└─ INSERT/UPDATE wp_users row for the SME admin's email
After all hooks complete, the SME admin browses to
https://wordpress.<smeDomain> → openid-connect-generic redirects to
Keycloak → returns to /wp-admin authenticated as administrator. No
WP install wizard, no manual config.
Required values
| Value | Description |
|---|---|
smeDomain |
The SME tenant's domain (e.g. acme.<otech-fqdn> or BYO acme.com). Used to derive the default ingress host as wordpress.<smeDomain>. |
oidc.issuerURL |
Discovery URL of the per-tenant Keycloak realm. Example: https://keycloak.acme.<otech-fqdn>/realms/sme-acme. The wp-cli Job derives the OIDC endpoint_* URLs from this. |
oidc.clientSecretName |
K8s Secret carrying the OIDC client secret (key client-secret). Provisioned by bp-keycloak's tenant-realm ConfigMap (PR #918) at the same time as the realm import. |
adminUser.email |
Email of the SME admin (must match the email claim Keycloak issues for that user). The admin-user Job pre-seeds a wp_user with this email and the administrator role. |
Back-compat (chart 0.1.x):
keycloak.{realmURL,clientID,clientSecretName}is still accepted as an alias when the modernoidc.*block is at its values.yaml defaults. New overlays MUST emitoidc.*— the legacy block is removed in chart0.3.0.
Override surface
All other values have sensible defaults; common overrides include:
| Value | Default | Notes |
|---|---|---|
global.imageRegistry |
"" |
Set to the Sovereign's Harbor proxy-cache hostname post-handover. |
wordpress.image.tag |
6-php8.3-apache |
The chart pins the manifest-list digest alongside; change tag+digest together. |
database.cnpgClusterName |
wordpress-db |
Per-tenant unique within the SME namespace. |
database.cluster.storageSize |
10Gi |
Postgres storage size. |
persistence.wpContent.size |
10Gi |
wp-content PVC size. |
persistence.wpContent.storageClass |
local-path |
Set to a RWX class if you want to scale replicas > 1. |
defaultTheme |
twentytwentyfive |
Any wordpress.org theme slug bundled with the official image. |
ingress.tls.issuer |
letsencrypt-prod |
cert-manager ClusterIssuer. |
See values.yaml for the full schema, including NetworkPolicy egress
peers, OIDC role mapping, and probe tuning.
Why Postgres (and not MySQL)?
Issue #800 specifies "bp-cnpg Postgres in tenant namespace". The
official wordpress image targets MySQL/MariaDB; we run it against
Postgres via the pg4wp mu-plugin (a wp-content/db.php drop-in that
intercepts wpdb at the PHP level and translates queries). This keeps
the SME tenant footprint to one database operator (bp-cnpg) instead
of sprouting a separate MySQL operator per SME — see the upstream
project at
https://github.com/PostgreSQL-For-Wordpress/postgresql-for-wordpress.
The pg4wp install is performed by the same wp-plugin-install
initContainer that installs openid-connect-generic, so the chart
needs no special image build.
Capabilities gate
Cluster.postgresql.cnpg.io is rendered behind a Capabilities check on
postgresql.cnpg.io/v1, so a cold install before bp-cnpg is
reconciling skips the Cluster CR (and the Pod waits in
Pending/CrashLoopBackOff until bp-cnpg lands and the Cluster is
re-rendered on the next reconcile). The Sovereign's bootstrap order
MUST land bp-cnpg before bp-wordpress-tenant.