Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachprod: pass --tenant-scope on cert gen from old binaries #98198

Closed
wants to merge 1 commit into from
Closed

roachprod: pass --tenant-scope on cert gen from old binaries #98198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions pkg/roachprod/install/cluster_synced.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,9 +1230,14 @@ func (c *SyncedCluster) DistributeCerts(ctx context.Context, l *logger.Logger) e
cmd += fmt.Sprintf(`
rm -fr certs
mkdir -p certs
VERSION=$(%[1]s version | grep "Build Tag:" | sed -e 's/Build Tag:[[:space:]]*//' | cut -d- -f1)
TENANT_SCOPE_OPT=""
if [[ "$VERSION" < "v23.1.0" ]]; then
TENANT_SCOPE_OPT="--tenant-scope 1,2,3,4,11,12,13,14"
fi
%[1]s cert create-ca --certs-dir=certs --ca-key=certs/ca.key
%[1]s cert create-client root --certs-dir=certs --ca-key=certs/ca.key
%[1]s cert create-client testuser --certs-dir=certs --ca-key=certs/ca.key
%[1]s cert create-client root --certs-dir=certs --ca-key=certs/ca.key $TENANT_SCOPE_OPT
%[1]s cert create-client testuser --certs-dir=certs --ca-key=certs/ca.key $TENANT_SCOPE_OPT
%[1]s cert create-node %[2]s --certs-dir=certs --ca-key=certs/ca.key
# Pre-create a few tenant-client
%[1]s cert create-tenant-client 2 %[2]s --certs-dir=certs --ca-key=certs/ca.key
Expand Down Expand Up @@ -1315,8 +1320,6 @@ func (c *SyncedCluster) createTenantCertBundle(
return c.Parallel(l, display, 1, 0, func(i int) (*RunResultDetails, error) {
node := c.Nodes[i]

var tenantScopeArg string

cmd := "set -e;"
if c.IsLocal() {
cmd += fmt.Sprintf(`cd %s ; `, c.localVMDir(1))
Expand All @@ -1329,16 +1332,20 @@ rm -fr $CERT_DIR
mkdir -p $CERT_DIR
cp certs/ca.crt $CERT_DIR
SHARED_ARGS="--certs-dir=$CERT_DIR --ca-key=$CA_KEY"
VERSION=$(%[1]s version | grep "Build Tag:" | sed -e 's/Build Tag:[[:space:]]*//' | cut -d- -f1)
TENANT_SCOPE_OPT=""
if [[ "$VERSION" < "v23.1.0" ]]; then
TENANT_SCOPE_OPT="--tenant-scope %[3]d"
fi
%[1]s cert create-node %[2]s $SHARED_ARGS
%[1]s cert create-tenant-client %[3]d %[2]s $SHARED_ARGS
%[1]s cert create-client root %[4]s $SHARED_ARGS
%[1]s cert create-client testuser %[4]s $SHARED_ARGS
tar cvf %[5]s $CERT_DIR
%[1]s cert create-client root $TENANT_SCOPE_OPT $SHARED_ARGS
%[1]s cert create-client testuser $TENANT_SCOPE_OPT $SHARED_ARGS
tar cvf %[4]s $CERT_DIR
`,
cockroachNodeBinary(c, node),
strings.Join(nodeNames, " "),
tenantID,
tenantScopeArg,
bundleName,
)

Expand Down