Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4cc270b

Browse files
coadlercoadler
authored
revert(enterprise): make pgcoord experimental again (#8797)
1 parent 98d9a65 commit 4cc270b

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

‎coderd/apidoc/docs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/deployment.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,10 +1846,9 @@ const (
18461846
// https://github.com/coder/coder/milestone/19
18471847
ExperimentWorkspaceActions Experiment = "workspace_actions"
18481848

1849-
// ExperimentTailnetHACoordinator downgrades to the haCoordinator instead
1850-
// of PGCoord. Should only be used if we see issues in prod with PGCoord
1851-
// which is now the default.
1852-
ExperimentTailnetHACoordinator Experiment = "tailnet_ha_coordinator"
1849+
// ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub-
1850+
// only Coordinator
1851+
ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator"
18531852

18541853
// ExperimentConvertToOIDC enables users to convert from password to
18551854
// oidc.

‎docs/api/schemas.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎enterprise/coderd/coderd.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,10 +535,10 @@ func (api *API) updateEntitlements(ctx context.Context) error {
535535
var coordinator agpltailnet.Coordinator
536536
if enabled {
537537
var haCoordinator agpltailnet.Coordinator
538-
if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetHACoordinator) {
539-
haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub)
540-
} else {
538+
if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetPGCoordinator) {
541539
haCoordinator, err = tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database)
540+
} else {
541+
haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub)
542542
}
543543
if err != nil {
544544
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))

‎site/src/api/typesGenerated.ts

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)