Skip to content

Commit 10629c7

Browse files
spikecurtisspikecurtis
committed
feat: promote PG Coordinator out of experimental
1 parent 48cd4c3 commit 10629c7

File tree

10 files changed

+8
-1237
lines changed

10 files changed

+8
-1237
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 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: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codersdk/deployment.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,10 +2080,6 @@ const (
20802080
// https://github.com/coder/coder/milestone/19
20812081
ExperimentWorkspaceActions Experiment = "workspace_actions"
20822082

2083-
// ExperimentTailnetPGCoordinator enables the PGCoord in favor of the pubsub-
2084-
// only Coordinator
2085-
ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator"
2086-
20872083
// Deployment health page
20882084
ExperimentDeploymentHealthPage Experiment = "deployment_health_page"
20892085

‎docs/api/schemas.md

Lines changed: 0 additions & 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: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -613,12 +613,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
613613
if initial, changed, enabled := featureChanged(codersdk.FeatureHighAvailability); shouldUpdate(initial, changed, enabled) {
614614
var coordinator agpltailnet.Coordinator
615615
if enabled {
616-
var haCoordinator agpltailnet.Coordinator
617-
if api.AGPL.Experiments.Enabled(codersdk.ExperimentTailnetPGCoordinator) {
618-
haCoordinator, err = tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database)
619-
} else {
620-
haCoordinator, err = tailnet.NewCoordinator(api.Logger, api.Pubsub)
621-
}
616+
haCoordinator, err := tailnet.NewPGCoord(api.ctx, api.Logger, api.Pubsub, api.Database)
622617
if err != nil {
623618
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))
624619
// If we try to setup the HA coordinator and it fails, nothing

‎enterprise/coderd/coderd_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ func TestEntitlements(t *testing.T) {
4848
require.Empty(t, res.Warnings)
4949
})
5050
t.Run("FullLicense", func(t *testing.T) {
51+
// PGCoordinator requires a real postgres
52+
if !dbtestutil.WillUsePostgres() {
53+
t.Skip("test only with postgres")
54+
}
5155
t.Parallel()
5256
adminClient, _ := coderdenttest.New(t, &coderdenttest.Options{
5357
AuditLogging: true,

0 commit comments

Comments
 (0)