diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index f2f94e2f48..2be2602448 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -8021,7 +8021,7 @@ const docTemplate = `{ "enum": [ "moons", "workspace_actions", - "tailnet_ha_coordinator", + "tailnet_pg_coordinator", "convert-to-oidc", "single_tailnet", "template_restart_requirement", @@ -8030,7 +8030,7 @@ const docTemplate = `{ "x-enum-varnames": [ "ExperimentMoons", "ExperimentWorkspaceActions", - "ExperimentTailnetHACoordinator", + "ExperimentTailnetPGCoordinator", "ExperimentConvertToOIDC", "ExperimentSingleTailnet", "ExperimentTemplateRestartRequirement", diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 6e1ea2af7f..6ed0d89c1f 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -7182,7 +7182,7 @@ "enum": [ "moons", "workspace_actions", - "tailnet_ha_coordinator", + "tailnet_pg_coordinator", "convert-to-oidc", "single_tailnet", "template_restart_requirement", @@ -7191,7 +7191,7 @@ "x-enum-varnames": [ "ExperimentMoons", "ExperimentWorkspaceActions", - "ExperimentTailnetHACoordinator", + "ExperimentTailnetPGCoordinator", "ExperimentConvertToOIDC", "ExperimentSingleTailnet", "ExperimentTemplateRestartRequirement", diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 23536cae55..de051256ec 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -1846,10 +1846,9 @@ const ( // https://github.com/coder/coder/milestone/19 ExperimentWorkspaceActions Experiment = "workspace_actions" - // ExperimentTailnetHACoordinator downgrades to the haCoordinator instead - // of PGCoord. Should only be used if we see issues in prod with PGCoord - // which is now the default. - ExperimentTailnetHACoordinator Experiment = "tailnet_ha_coordinator" + // ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub- + // only Coordinator + ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator" // ExperimentConvertToOIDC enables users to convert from password to // oidc. diff --git a/docs/api/schemas.md b/docs/api/schemas.md index 5b47c7c10b..03bf590df0 100644 --- a/docs/api/schemas.md +++ b/docs/api/schemas.md @@ -2672,7 +2672,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | ------------------------------ | | `moons` | | `workspace_actions` | -| `tailnet_ha_coordinator` | +| `tailnet_pg_coordinator` | | `convert-to-oidc` | | `single_tailnet` | | `template_restart_requirement` | diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go index e41883cf5b..87c041b88d 100644 --- a/enterprise/coderd/coderd.go +++ b/enterprise/coderd/coderd.go @@ -535,10 +535,10 @@ func (api *API) updateEntitlements(ctx context.Context) error { var coordinator agpltailnet.Coordinator if enabled { var haCoordinator agpltailnet.Coordinator - if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetHACoordinator) { - haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub) - } else { + if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetPGCoordinator) { haCoordinator, err = tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database) + } else { + haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub) } if err != nil { api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err)) diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index b26921e38d..4eaff1ea1d 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1563,7 +1563,7 @@ export type Experiment = | "convert-to-oidc" | "moons" | "single_tailnet" - | "tailnet_ha_coordinator" + | "tailnet_pg_coordinator" | "template_insights_page" | "template_restart_requirement" | "workspace_actions" @@ -1571,7 +1571,7 @@ export const Experiments: Experiment[] = [ "convert-to-oidc", "moons", "single_tailnet", - "tailnet_ha_coordinator", + "tailnet_pg_coordinator", "template_insights_page", "template_restart_requirement", "workspace_actions",