From df89e2c3b01e3b5838d72f6a8659a116d44712a6 Mon Sep 17 00:00:00 2001
From: Ben Potter <ben@coder.com>
Date: Tue, 25 Oct 2022 09:33:37 -0500
Subject: [PATCH] chore: Move deployment UI and HA out of experimental (#4722)

* Revert "chore: Move deployment UI and HA into experimental (#4595)"

This reverts commit 18c4368571c4a8ddcfc3d8e90746cee17f118d37.

* restore flag in coderdtest
---
 enterprise/coderd/coderd.go           | 2 +-
 enterprise/coderd/replicas_test.go    | 9 ++-------
 site/src/components/Navbar/Navbar.tsx | 7 +------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
index b65dd42715..a404159e51 100644
--- a/enterprise/coderd/coderd.go
+++ b/enterprise/coderd/coderd.go
@@ -263,7 +263,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 
 	if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed {
 		coordinator := agpltailnet.NewCoordinator()
-		if api.Experimental && enabled {
+		if enabled {
 			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/enterprise/coderd/replicas_test.go b/enterprise/coderd/replicas_test.go
index b14e52dd58..7a3e130cf7 100644
--- a/enterprise/coderd/replicas_test.go
+++ b/enterprise/coderd/replicas_test.go
@@ -24,7 +24,6 @@ func TestReplicas(t *testing.T) {
 		db, pubsub := dbtestutil.NewDB(t)
 		firstClient := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				Experimental:             true,
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
@@ -55,7 +54,6 @@ func TestReplicas(t *testing.T) {
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
-				Experimental:             true,
 			},
 		})
 		firstUser := coderdtest.CreateFirstUser(t, firstClient)
@@ -65,9 +63,8 @@ func TestReplicas(t *testing.T) {
 
 		secondClient := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				Experimental: true,
-				Database:     db,
-				Pubsub:       pubsub,
+				Database: db,
+				Pubsub:   pubsub,
 			},
 		})
 		secondClient.SessionToken = firstClient.SessionToken
@@ -95,7 +92,6 @@ func TestReplicas(t *testing.T) {
 		certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")}
 		firstClient := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				Experimental:             true,
 				IncludeProvisionerDaemon: true,
 				Database:                 db,
 				Pubsub:                   pubsub,
@@ -109,7 +105,6 @@ func TestReplicas(t *testing.T) {
 
 		secondClient := coderdenttest.New(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
-				Experimental:    true,
 				Database:        db,
 				Pubsub:          pubsub,
 				TLSCertificates: certificates,
diff --git a/site/src/components/Navbar/Navbar.tsx b/site/src/components/Navbar/Navbar.tsx
index 56d763b4a6..ba88831219 100644
--- a/site/src/components/Navbar/Navbar.tsx
+++ b/site/src/components/Navbar/Navbar.tsx
@@ -14,15 +14,10 @@ export const Navbar: React.FC = () => {
     selectFeatureVisibility,
     shallowEqual,
   )
-  const experimental = useSelector(
-    xServices.entitlementsXService,
-    (state) => state.context.entitlements.experimental,
-  )
   const canViewAuditLog =
     featureVisibility[FeatureNames.AuditLog] &&
     Boolean(permissions?.viewAuditLog)
-  const canViewDeployment =
-    experimental && Boolean(permissions?.viewDeploymentConfig)
+  const canViewDeployment = Boolean(permissions?.viewDeploymentConfig)
   const onSignOut = () => authSend("SIGN_OUT")
 
   return (