add feature flag

coder · coadler · Jul 12, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023
commit 7bfac9be2bafccadadb58439816c5174e10de103
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -364,15 +364,21 @@ func New(options *Options) *API {
 
 	api.Auditor.Store(&options.Auditor)
 	api.TailnetCoordinator.Store(&options.TailnetCoordinator)
-	api.tailnet, err = NewServerTailnet(api.ctx,
-		options.Logger,
-		options.DERPServer,
-		options.DERPMap,
-		&api.TailnetCoordinator,
-		wsconncache.New(api._dialWorkspaceAgentTailnet, 0),
-	)
-	if err != nil {
-		panic("failed to setup server tailnet: " + err.Error())
+	if api.Experiments.Enabled(codersdk.ExperimentSingleTailnet) {
+		api.agentProvider, err = NewServerTailnet(api.ctx,
+			options.Logger,
+			options.DERPServer,
+			options.DERPMap,
+			&api.TailnetCoordinator,
+			wsconncache.New(api._dialWorkspaceAgentTailnet, 0),
+		)
+		if err != nil {
+			panic("failed to setup server tailnet: " + err.Error())
+		}
+	} else {
+		api.agentProvider = &wsconncache.AgentProvider{
+			Cache: wsconncache.New(api._dialWorkspaceAgentTailnet, 0),
+		}
 	}
 
 	api.workspaceAppServer = &workspaceapps.Server{
@@ -385,7 +391,7 @@ func New(options *Options) *API {
 		RealIPConfig:  options.RealIPConfig,
 
 		SignedTokenProvider: api.WorkspaceAppsProvider,
-		AgentProvider:       api.tailnet,
+		AgentProvider:       api.agentProvider,
 		AppSecurityKey:      options.AppSecurityKey,
 
 		DisablePathApps:  options.DeploymentValues.DisablePathApps.Value(),
@@ -923,7 +929,7 @@ type API struct {
 	updateChecker         *updatecheck.Checker
 	WorkspaceAppsProvider workspaceapps.SignedTokenProvider
 	workspaceAppServer    *workspaceapps.Server
-	tailnet               *ServerTailnet
+	agentProvider         workspaceapps.AgentProvider
 
 	// Experiments contains the list of experiments currently enabled.
 	// This is used to gate features that are not yet ready for production.
@@ -950,7 +956,7 @@ func (api *API) Close() error {
 	if coordinator != nil {
 		_ = (*coordinator).Close()
 	}
-	_ = api.tailnet.Close()
+	_ = api.agentProvider.Close()
 	return nil
 }
 

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -655,7 +655,7 @@ func (api *API) workspaceAgentListeningPorts(rw http.ResponseWriter, r *http.Req
 		return
 	}
 
-	agentConn, release, err := api.tailnet.AgentConn(ctx, workspaceAgent.ID)
+	agentConn, release, err := api.agentProvider.AgentConn(ctx, workspaceAgent.ID)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error dialing workspace agent.",

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1763,6 +1763,12 @@ const (
 	// oidc.
 	ExperimentConvertToOIDC Experiment = "convert-to-oidc"
 
+	// ExperimentSingleTailnet replaces workspace connections inside coderd to
+	// all use a single tailnet, instead of the previous behavior of creating a
+	// single tailnet for each agent.
+	// WARNING: This cannot be enabled when using HA.
+	ExperimentSingleTailnet Experiment = "single_tailnet"
+
 	// Add new experiments here!
 	// ExperimentExample Experiment = "example"
 )

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -2539,6 +2539,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
 | `workspace_actions`      |
 | `tailnet_pg_coordinator` |
 | `convert-to-oidc`        |
+| `single_tailnet`         |
 
 ## codersdk.Feature
 

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -1414,11 +1414,13 @@ export const Entitlements: Entitlement[] = [
 export type Experiment =
   | "convert-to-oidc"
   | "moons"
+  | "single_tailnet"
   | "tailnet_pg_coordinator"
   | "workspace_actions"
 export const Experiments: Experiment[] = [
   "convert-to-oidc",
   "moons",
+  "single_tailnet",
   "tailnet_pg_coordinator",
   "workspace_actions",
 ]