revert(enterprise): make pgcoord experimental again (#8797)

This commit is contained in:
Colin Adler
2023-07-28 18:38:32 -05:00
committed by GitHub
parent 98d9a65cf5
commit 4cc270b12b
6 changed files with 13 additions and 14 deletions
+2 -2
View File
@@ -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",
+2 -2
View File
@@ -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",
+3 -4
View File
@@ -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.
+1 -1
View File
@@ -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` |
+3 -3
View File
@@ -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))
+2 -2
View File
@@ -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",