mirror of
https://github.com/coder/coder.git
synced 2025-07-13 21:36:50 +00:00
chore: Move deployment UI and HA out of experimental (#4722)
* Revert "chore: Move deployment UI and HA into experimental (#4595)"
This reverts commit 18c4368571
.
* restore flag in coderdtest
This commit is contained in:
@ -263,7 +263,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
|
|||||||
|
|
||||||
if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed {
|
if changed, enabled := featureChanged(codersdk.FeatureHighAvailability); changed {
|
||||||
coordinator := agpltailnet.NewCoordinator()
|
coordinator := agpltailnet.NewCoordinator()
|
||||||
if api.Experimental && enabled {
|
if enabled {
|
||||||
haCoordinator, err := tailnet.NewCoordinator(api.Logger, api.Pubsub)
|
haCoordinator, err := tailnet.NewCoordinator(api.Logger, api.Pubsub)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))
|
api.Logger.Error(ctx, "unable to set up high availability coordinator", slog.Error(err))
|
||||||
|
@ -24,7 +24,6 @@ func TestReplicas(t *testing.T) {
|
|||||||
db, pubsub := dbtestutil.NewDB(t)
|
db, pubsub := dbtestutil.NewDB(t)
|
||||||
firstClient := coderdenttest.New(t, &coderdenttest.Options{
|
firstClient := coderdenttest.New(t, &coderdenttest.Options{
|
||||||
Options: &coderdtest.Options{
|
Options: &coderdtest.Options{
|
||||||
Experimental: true,
|
|
||||||
IncludeProvisionerDaemon: true,
|
IncludeProvisionerDaemon: true,
|
||||||
Database: db,
|
Database: db,
|
||||||
Pubsub: pubsub,
|
Pubsub: pubsub,
|
||||||
@ -55,7 +54,6 @@ func TestReplicas(t *testing.T) {
|
|||||||
IncludeProvisionerDaemon: true,
|
IncludeProvisionerDaemon: true,
|
||||||
Database: db,
|
Database: db,
|
||||||
Pubsub: pubsub,
|
Pubsub: pubsub,
|
||||||
Experimental: true,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
firstUser := coderdtest.CreateFirstUser(t, firstClient)
|
firstUser := coderdtest.CreateFirstUser(t, firstClient)
|
||||||
@ -65,9 +63,8 @@ func TestReplicas(t *testing.T) {
|
|||||||
|
|
||||||
secondClient := coderdenttest.New(t, &coderdenttest.Options{
|
secondClient := coderdenttest.New(t, &coderdenttest.Options{
|
||||||
Options: &coderdtest.Options{
|
Options: &coderdtest.Options{
|
||||||
Experimental: true,
|
Database: db,
|
||||||
Database: db,
|
Pubsub: pubsub,
|
||||||
Pubsub: pubsub,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
secondClient.SessionToken = firstClient.SessionToken
|
secondClient.SessionToken = firstClient.SessionToken
|
||||||
@ -95,7 +92,6 @@ func TestReplicas(t *testing.T) {
|
|||||||
certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")}
|
certificates := []tls.Certificate{testutil.GenerateTLSCertificate(t, "localhost")}
|
||||||
firstClient := coderdenttest.New(t, &coderdenttest.Options{
|
firstClient := coderdenttest.New(t, &coderdenttest.Options{
|
||||||
Options: &coderdtest.Options{
|
Options: &coderdtest.Options{
|
||||||
Experimental: true,
|
|
||||||
IncludeProvisionerDaemon: true,
|
IncludeProvisionerDaemon: true,
|
||||||
Database: db,
|
Database: db,
|
||||||
Pubsub: pubsub,
|
Pubsub: pubsub,
|
||||||
@ -109,7 +105,6 @@ func TestReplicas(t *testing.T) {
|
|||||||
|
|
||||||
secondClient := coderdenttest.New(t, &coderdenttest.Options{
|
secondClient := coderdenttest.New(t, &coderdenttest.Options{
|
||||||
Options: &coderdtest.Options{
|
Options: &coderdtest.Options{
|
||||||
Experimental: true,
|
|
||||||
Database: db,
|
Database: db,
|
||||||
Pubsub: pubsub,
|
Pubsub: pubsub,
|
||||||
TLSCertificates: certificates,
|
TLSCertificates: certificates,
|
||||||
|
@ -14,15 +14,10 @@ export const Navbar: React.FC = () => {
|
|||||||
selectFeatureVisibility,
|
selectFeatureVisibility,
|
||||||
shallowEqual,
|
shallowEqual,
|
||||||
)
|
)
|
||||||
const experimental = useSelector(
|
|
||||||
xServices.entitlementsXService,
|
|
||||||
(state) => state.context.entitlements.experimental,
|
|
||||||
)
|
|
||||||
const canViewAuditLog =
|
const canViewAuditLog =
|
||||||
featureVisibility[FeatureNames.AuditLog] &&
|
featureVisibility[FeatureNames.AuditLog] &&
|
||||||
Boolean(permissions?.viewAuditLog)
|
Boolean(permissions?.viewAuditLog)
|
||||||
const canViewDeployment =
|
const canViewDeployment = Boolean(permissions?.viewDeploymentConfig)
|
||||||
experimental && Boolean(permissions?.viewDeploymentConfig)
|
|
||||||
const onSignOut = () => authSend("SIGN_OUT")
|
const onSignOut = () => authSend("SIGN_OUT")
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
Reference in New Issue
Block a user