Skip to content

Commit c19bd1f

Browse files
committed
demo: remove system tenant DDL restrictions
This makes demo different from the current out of box experience where these settings. Epic: none Release note: None
1 parent d358a24 commit c19bd1f

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

pkg/cli/democluster/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ go_library(
3737
"//pkg/sql/catalog/catalogkeys",
3838
"//pkg/sql/isql",
3939
"//pkg/sql/sem/catconstants",
40-
"//pkg/sql/sqlclustersettings",
4140
"//pkg/storage/fs",
4241
"//pkg/testutils/serverutils",
4342
"//pkg/testutils/serverutils/regionlatency",
@@ -78,7 +77,6 @@ go_test(
7877
"//pkg/security/securityassets",
7978
"//pkg/security/securitytest",
8079
"//pkg/server",
81-
"//pkg/sql/sqlclustersettings",
8280
"//pkg/storage/fs",
8381
"//pkg/testutils",
8482
"//pkg/testutils/serverutils/regionlatency",

pkg/cli/democluster/demo_cluster.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys"
4040
"github.com/cockroachdb/cockroach/pkg/sql/isql"
4141
"github.com/cockroachdb/cockroach/pkg/sql/sem/catconstants"
42-
"github.com/cockroachdb/cockroach/pkg/sql/sqlclustersettings"
4342
"github.com/cockroachdb/cockroach/pkg/storage/fs"
4443
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
4544
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils/regionlatency"
@@ -457,15 +456,6 @@ func (c *transientCluster) Start(ctx context.Context) (err error) {
457456
return err
458457
}
459458
}
460-
461-
for _, s := range []string{
462-
string(sqlclustersettings.RestrictAccessToSystemInterface.Name()),
463-
string(sql.TipUserAboutSystemInterface.Name()),
464-
} {
465-
if _, err := ie.Exec(ctx, "restrict-system-interface", nil, fmt.Sprintf(`SET CLUSTER SETTING %s = true`, s)); err != nil {
466-
return err
467-
}
468-
}
469459
}
470460

471461
// Prepare the URL for use by the SQL shell.

pkg/cli/democluster/demo_cluster_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/cockroachdb/cockroach/pkg/security/securityassets"
2323
"github.com/cockroachdb/cockroach/pkg/security/securitytest"
2424
"github.com/cockroachdb/cockroach/pkg/server"
25-
"github.com/cockroachdb/cockroach/pkg/sql/sqlclustersettings"
2625
"github.com/cockroachdb/cockroach/pkg/storage/fs"
2726
"github.com/cockroachdb/cockroach/pkg/testutils"
2827
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils/regionlatency"
@@ -309,9 +308,6 @@ func TestTransientClusterMultitenant(t *testing.T) {
309308
ctx, cancel = c.stopper.WithCancelOnQuiesce(ctx)
310309
defer cancel()
311310

312-
// Ensure CREATE TABLE below works properly.
313-
sqlclustersettings.RestrictAccessToSystemInterface.Override(ctx, &c.firstServer.SystemLayer().ClusterSettings().SV, false)
314-
315311
testutils.RunTrueAndFalse(t, "forSecondaryTenant", func(t *testing.T, forSecondaryTenant bool) {
316312
url, err := c.getNetworkURLForServer(ctx, 0,
317313
true /* includeAppName */, serverSelection(forSecondaryTenant))

0 commit comments

Comments
 (0)