Skip to content

Commit

Permalink
Merge #55812
Browse files Browse the repository at this point in the history
55812: Fix multiregion setup r=DuskEagle a=Tayo-00

The multiregion setup is missing a comma, preventing deployments ran using this file from being accessed through `cockroachdb-public.default`.
This adds in the extra comma and fixes the issue.

Co-authored-by: Tayo <[email protected]>
  • Loading branch information
craig[bot] and lvdlee committed Oct 21, 2020
2 parents c638b8e + 0264009 commit 4b8a9c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cloud/kubernetes/multiregion/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
check_call(['kubectl', 'create', 'namespace', zone, '--context', context])
check_call(['kubectl', 'create', 'secret', 'generic', 'cockroachdb.client.root', '--from-file', certs_dir, '--context', context])
check_call(['kubectl', 'create', 'secret', 'generic', 'cockroachdb.client.root', '--namespace', zone, '--from-file', certs_dir, '--context', context])
check_call([cockroach_path, 'cert', 'create-node', '--certs-dir', certs_dir, '--ca-key', ca_key_dir+'/ca.key', 'localhost', '127.0.0.1', 'cockroachdb-public', 'cockroachdb-public.default' 'cockroachdb-public.'+zone, 'cockroachdb-public.%s.svc.cluster.local' % (zone), '*.cockroachdb', '*.cockroachdb.'+zone, '*.cockroachdb.%s.svc.cluster.local' % (zone)])
check_call([cockroach_path, 'cert', 'create-node', '--certs-dir', certs_dir, '--ca-key', ca_key_dir+'/ca.key', 'localhost', '127.0.0.1', 'cockroachdb-public', 'cockroachdb-public.default', 'cockroachdb-public.'+zone, 'cockroachdb-public.%s.svc.cluster.local' % (zone), '*.cockroachdb', '*.cockroachdb.'+zone, '*.cockroachdb.%s.svc.cluster.local' % (zone)])
check_call(['kubectl', 'create', 'secret', 'generic', 'cockroachdb.node', '--namespace', zone, '--from-file', certs_dir, '--context', context])
check_call('rm %s/node.*' % (certs_dir), shell=True)

Expand Down

0 comments on commit 4b8a9c7

Please sign in to comment.