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

Skip to content

Commit df89e2c

Browse files
authored
chore: Move deployment UI and HA out of experimental (#4722)
* Revert "chore: Move deployment UI and HA into experimental (#4595)" This reverts commit 18c4368. * restore flag in coderdtest
1 parent 067362c commit df89e2c

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

enterprise/coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
263263

264264
if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed {
265265
coordinator := agpltailnet.NewCoordinator()
266-
if api.Experimental && enabled {
266+
if enabled {
267267
haCoordinator, err := tailnet.NewCoordinator(api.Logger, api.Pubsub)
268268
if err != nil {
269269
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))

enterprise/coderd/replicas_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func TestReplicas(t *testing.T) {
2424
db, pubsub := dbtestutil.NewDB(t)
2525
firstClient := coderdenttest.New(t, &coderdenttest.Options{
2626
Options: &coderdtest.Options{
27-
Experimental: true,
2827
IncludeProvisionerDaemon: true,
2928
Database: db,
3029
Pubsub: pubsub,
@@ -55,7 +54,6 @@ func TestReplicas(t *testing.T) {
5554
IncludeProvisionerDaemon: true,
5655
Database: db,
5756
Pubsub: pubsub,
58-
Experimental: true,
5957
},
6058
})
6159
firstUser := coderdtest.CreateFirstUser(t, firstClient)
@@ -65,9 +63,8 @@ func TestReplicas(t *testing.T) {
6563

6664
secondClient := coderdenttest.New(t, &coderdenttest.Options{
6765
Options: &coderdtest.Options{
68-
Experimental: true,
69-
Database: db,
70-
Pubsub: pubsub,
66+
Database: db,
67+
Pubsub: pubsub,
7168
},
7269
})
7370
secondClient.SessionToken = firstClient.SessionToken
@@ -95,7 +92,6 @@ func TestReplicas(t *testing.T) {
9592
certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")}
9693
firstClient := coderdenttest.New(t, &coderdenttest.Options{
9794
Options: &coderdtest.Options{
98-
Experimental: true,
9995
IncludeProvisionerDaemon: true,
10096
Database: db,
10197
Pubsub: pubsub,
@@ -109,7 +105,6 @@ func TestReplicas(t *testing.T) {
109105

110106
secondClient := coderdenttest.New(t, &coderdenttest.Options{
111107
Options: &coderdtest.Options{
112-
Experimental: true,
113108
Database: db,
114109
Pubsub: pubsub,
115110
TLSCertificates: certificates,

site/src/components/Navbar/Navbar.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@ export const Navbar: React.FC = () => {
1414
selectFeatureVisibility,
1515
shallowEqual,
1616
)
17-
const experimental = useSelector(
18-
xServices.entitlementsXService,
19-
(state) => state.context.entitlements.experimental,
20-
)
2117
const canViewAuditLog =
2218
featureVisibility[FeatureNames.AuditLog] &&
2319
Boolean(permissions?.viewAuditLog)
24-
const canViewDeployment =
25-
experimental && Boolean(permissions?.viewDeploymentConfig)
20+
const canViewDeployment = Boolean(permissions?.viewDeploymentConfig)
2621
const onSignOut = () => authSend("SIGN_OUT")
2722

2823
return (

0 commit comments

Comments
 (0)