Skip to content

Commit 82effd3

Browse files
authored
TRITON-2304 New image server names (#77)
Reviewed by: Dan McDonald <[email protected]>
1 parent 73a4561 commit 82effd3

File tree

16 files changed

+670
-119
lines changed

16 files changed

+670
-119
lines changed

CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<!--
88
Copyright 2019 Joyent, Inc.
9+
Copyright 2022 MNX Cloud, Inc.
910
-->
1011

1112
# Manta Contribution Guidelines
1213

1314
Thanks for using Manta and for considering contributing to it!
1415

15-
1616
# Code
1717

1818
All changes to Manta project repositories go through code review via a GitHub
@@ -27,7 +27,7 @@ See the [developer guide](docs/developer-guide) for useful information about
2727
building and testing the software.
2828

2929
Manta repositories use the same [Joyent Engineering
30-
Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md) as
30+
Guidelines](https://github.com/TritonDataCenter/eng/blob/master/docs/index.md) as
3131
the Triton project. Notably:
3232

3333
* The #master branch should be first-customer-ship (FCS) quality at all times.
@@ -38,19 +38,18 @@ the Triton project. Notably:
3838
Typically each repository has `make check` to lint and check code style.
3939
Specific code style can vary by repository.
4040

41-
4241
## Issues
4342

4443
There are two separate issue trackers that are relevant for Manta code:
4544

46-
- An internal-to-Joyent JIRA instance.
45+
* An internal JIRA instance.
4746

4847
A JIRA ticket has an ID like `MANTA-380`, where "MANTA" is the JIRA project
4948
name. A read-only view of many JIRA tickets is made available at
5049
<https://smartos.org/bugview/> (e.g.
5150
<https://smartos.org/bugview/MANTA-380>).
5251

53-
- GitHub issues for the relevant repository.
52+
* GitHub issues for the relevant repository.
5453

5554
Before Manta was open sourced, Joyent engineering used a private JIRA instance.
5655
While Joyent continues to use JIRA internally, we also use GitHub issues for

README.md

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<!--
88
Copyright 2020 Joyent, Inc.
9+
Copyright 2022 MNX Cloud, Inc.
910
-->
1011

1112
# Manta: a scalable, distributed object store
@@ -49,11 +50,10 @@ Community discussion about Manta happens in two main places:
4950
* In the *#manta* IRC channel on the
5051
[Libera.chat IRC network](https://libera.chat/).
5152

52-
5353
## Dependencies
5454

5555
Manta is composed of a number of services that deploy on top of Joyent's
56-
[Triton DataCenter](https://github.com/joyent/triton) platform (just "Triton"
56+
[Triton DataCenter](https://github.com/TritonDataCenter/triton) platform (just "Triton"
5757
for short), which is also open-source. Triton provides services for operating
5858
physical servers (compute nodes), deploying services in containers, monitoring
5959
services, transmitting and visualizing real-time performance data, and a bunch
@@ -63,7 +63,6 @@ service monitoring.
6363
Triton itself depends on [SmartOS](http://smartos.org). Manta also directly
6464
depends on several SmartOS features, notably ZFS.
6565

66-
6766
## Building and Deploying Manta
6867

6968
Manta service images are built and packaged using the same mechanisms as
@@ -76,7 +75,6 @@ in VMware and then follow those instructions to deploy Manta on it.
7675
If you want to deploy your own builds of Manta components, see "Deploying your
7776
own Manta Builds" below.
7877

79-
8078
## Repositories
8179

8280
This repository is just a wrapper containing documentation about Manta. Manta
@@ -85,52 +83,52 @@ some of the more important ones.
8583

8684
A full list of repositories relevant to Manta is maintained in a [repo manifest
8785
file](./tools/jr-manifest.json) in this repo. To more conveniently list those
88-
repos, you can use the [`jr` tool](https://github.com/joyent/joyent-repos#jr).
86+
repos, you can use the [`jr` tool](https://github.com/TritonDataCenter/joyent-repos#jr).
8987

9088
The front door services respond to requests from the internet at large:
9189

92-
* [muppet](https://github.com/joyent/muppet): the haproxy-based "loadbalancer"
90+
* [muppet](https://github.com/TritonDataCenter/muppet): the haproxy-based "loadbalancer"
9391
service
94-
* [muskie](https://github.com/joyent/manta-muskie): the node.js-based "webapi"
92+
* [muskie](https://github.com/TritonDataCenter/manta-muskie): the node.js-based "webapi"
9593
service, this is Manta's "Directory API"
96-
* [buckets-api](https://github.com/joyent/manta-buckets-api): Node.js-based
94+
* [buckets-api](https://github.com/TritonDataCenter/manta-buckets-api): Node.js-based
9795
"buckets-api" service, this is Manta's "Buckets API"
9896

9997
The metadata tiers for the Directory and Buckets APIs store the entire object
10098
namespace (not object data) as well as backend storage system capacity:
10199

102-
* [manatee](https://github.com/joyent/manatee): the "postgres" service, a
100+
* [manatee](https://github.com/TritonDataCenter/manatee): the "postgres" service, a
103101
high-availability postgres cluster using synchronous replication and automatic
104102
fail-over
105-
* [moray](https://github.com/joyent/moray): Node-based key-value store built on
103+
* [moray](https://github.com/TritonDataCenter/moray): Node-based key-value store built on
106104
top of manatee. Also responsible for monitoring manatee replication topology
107105
(i.e., which postgres instance is the master).
108-
* [electric-moray](https://github.com/joyent/electric-moray): Node-based service
106+
* [electric-moray](https://github.com/TritonDataCenter/electric-moray): Node-based service
109107
that provides the same interface as Moray, but which directs requests to one
110108
or more Moray+Manatee *shards* based on hashing the Moray key.
111-
* [buckets-mdapi](https://github.com/joyent/manta-buckets-mdapi): a Rust-based
109+
* [buckets-mdapi](https://github.com/TritonDataCenter/manta-buckets-mdapi): a Rust-based
112110
API for managing all metadata for the Buckets API
113-
* [buckets-mdplacement](https://github.com/joyent/manta-buckets-mdplacement): a
111+
* [buckets-mdplacement](https://github.com/TritonDataCenter/manta-buckets-mdplacement): a
114112
Rust-based API for handling routing of Buckets API objects to appropriate
115113
nodes in the storage tier.
116114

117115
The storage tier is responsible for actually storing bits on disk:
118116

119-
* [mako](https://github.com/joyent/manta-mako): the "storage" service, a
117+
* [mako](https://github.com/TritonDataCenter/manta-mako): the "storage" service, a
120118
nginx-based server that receives PUT/GET requests from the front door services
121119
to store object data on disk
122-
* [minnow](https://github.com/joyent/manta-minnow): a Node-based agent that
120+
* [minnow](https://github.com/TritonDataCenter/manta-minnow): a Node-based agent that
123121
runs inside storage instances to periodically report storage capacity to the
124122
metadata tier
125123

126124
There are a number of services not part of the data path that are critical for
127125
Manta's operation. For example:
128126

129-
* [binder](https://github.com/joyent/binder): hosts both ZooKeeper (used for
127+
* [binder](https://github.com/TritonDataCenter/binder): hosts both ZooKeeper (used for
130128
manatee leader election and for group membership) and a Node-based DNS server
131129
that keeps track of which instances of each service are online at any given
132130
time
133-
* [mahi](https://github.com/joyent/mahi): The "authcache" service for handling authn/authz.
131+
* [mahi](https://github.com/TritonDataCenter/mahi): The "authcache" service for handling authn/authz.
134132

135133
Most of the above components are *services*, of which there may be multiple
136134
*instances* in a single Manta deployment. Except for the last category of
@@ -141,7 +139,6 @@ For more details on the architecture, including how these pieces actually fit
141139
together, see the [Architecture](./docs/operator-guide/architecture.md) section
142140
of the Operator Guide.
143141

144-
145142
## Deploying your own Manta Builds
146143

147144
As described above, as part of the normal Manta deployment process, you start
@@ -157,7 +154,7 @@ do this:
157154

158155
1. Complete the Manta deployment procedure from the operator guide.
159156
2. Build a zone image for whatever zone you want to replace. See the
160-
instructions for building [Triton](https://github.com/joyent/triton)
157+
instructions for building [Triton](https://github.com/TritonDataCenter/triton)
161158
zone images. Manta zones work the same way. The output of this process
162159
will be a zone **image**, identified by uuid. The image is comprised of
163160
two files: an image manifest (a JSON file) and the image file itself
@@ -184,7 +181,7 @@ do this:
184181
If for some reason you want to avoid deploying the Joyent builds at all, you'll
185182
have to follow a more manual procedure. One approach is to update the SAPI
186183
configuration for whatever service you want (using sdc-sapi -- see
187-
[SAPI](https://github.com/joyent/sdc-sapi)) *immediately after* running
184+
[SAPI](https://github.com/TritonDataCenter/sdc-sapi)) *immediately after* running
188185
manta-init but before deploying anything. Note that each subsequent
189186
"manta-init" will clobber this change, though the SAPI configuration is normally
190187
only used for the initial deployment anyway. The other option is to apply the
@@ -198,7 +195,6 @@ components above. The other two kinds of components are the *platform* and
198195
*agents*. Both of these procedures are documented in the Operator Guide,
199196
and they work to deploy custom builds as well as the official Joyent builds.
200197

201-
202198
## Contributing to Manta
203199

204200
To report bugs or request features, you can submit issues to the Manta project
@@ -208,7 +204,6 @@ you should contact Joyent support instead.
208204
See the [Contribution Guidelines](./CONTRIBUTING.md) for information about
209205
contributing changes to the project.
210206

211-
212207
## Design principles
213208

214209
Manta assumes several constraints on the data storage problem:

docs/developer-guide/README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ works like this:
6767
1. Build the repository itself.
6868
2. Build an image (a zone filesystem template and some metadata) from the
6969
contents of the built repository.
70-
3. Optionally, publish the image to updates.joyent.com.
70+
3. Optionally, publish the image to updates.tritondatacenter.com.
7171
4. Import the image into a Triton instance.
7272
5. Provision a new zone from the imported image.
7373
6. During the first boot, the zone executes a one-time setup script.
@@ -81,14 +81,14 @@ There are tools to automate most of this:
8181
which assembles an image containing the built Manta component. The image
8282
represents a template filesystem with which instances of this
8383
component will be stamped out. After the image is built, it can be uploaded
84-
to updates.joyent.com. Alternatively, the image can be manually imported to
84+
to updates.tritondatacenter.com. Alternatively, the image can be manually imported to
8585
a Triton instance by copying the image manifest and image file
8686
(a compressed zfs send stream) to the headnode and running
8787
"sdc-imgadm import".
8888
* The "manta-init" command takes care of step 4. You run this as part of any
8989
deployment. See the [Manta Operator's Guide](https://joyent.github.io/manta)
9090
for details. After the first run, subsequent runs find new images in
91-
updates.joyent.com, import them into the current Triton instance, and mark
91+
updates.tritondatacenter.com, import them into the current Triton instance, and mark
9292
them for use by "manta-deploy". Alternatively, if you have images that were
9393
manually imported using "sdc-imgadm import", then "manta-init" can be run
9494
with the "-n" flag to use those local images instead.
@@ -98,7 +98,7 @@ There are tools to automate most of this:
9898
previous steps.
9999

100100
For more information on the zone setup and boot process, see the
101-
[manta-scripts](https://github.com/joyent/manta-scripts) repo.
101+
[manta-scripts](https://github.com/TritonDataCenter/manta-scripts) repo.
102102

103103

104104
# Testing changes inside an actual Manta deployment
@@ -137,17 +137,17 @@ which is that most components are delivered as zone images and deployed by
137137
provisioning new zones from these images. While the deployment tools are
138138
slightly different than Triton's, the build process is nearly identical. The
139139
common instructions for building zone images are part of the [Triton
140-
documentation](https://github.com/joyent/triton/blob/master/docs/developer-guide/building.md).
140+
documentation](https://github.com/TritonDataCenter/triton/blob/master/docs/developer-guide/building.md).
141141

142142
## Building with your changes
143143

144144
Building a repository checked out to a given git branch will include those
145145
changes in the resulting image.
146146

147147
One exception, is any `agents` (for example
148-
[`amon`](https://github.com/joyent/sdc-amon),
149-
[`config-agent`](https://github.com/joyent/sdc-config-agent/),
150-
[`registrar`](https://github.com/joyent/registrar), (there are others)) that
148+
[`amon`](https://github.com/TritonDataCenter/sdc-amon),
149+
[`config-agent`](https://github.com/TritonDataCenter/sdc-config-agent/),
150+
[`registrar`](https://github.com/TritonDataCenter/registrar), (there are others)) that
151151
are bundled within the image.
152152

153153
At build-time, the build will attempt to build agents from the same branch
@@ -163,10 +163,10 @@ branch name as the checked-out branch of the component you're building, before
163163
finally falling back to the `master` branch of that agent repository.
164164

165165
The mechanism used is described in the
166-
[`Makefile.agent_prebuilt.defs`](https://github.com/joyent/eng/blob/master/tools/mk/Makefile.agent_prebuilt.defs),
167-
[`Makefile.agent_prebuilt.targ`](https://github.com/joyent/eng/blob/master/tools/mk/Makefile.agent_prebuilt.targ),
166+
[`Makefile.agent_prebuilt.defs`](https://github.com/TritonDataCenter/eng/blob/master/tools/mk/Makefile.agent_prebuilt.defs),
167+
[`Makefile.agent_prebuilt.targ`](https://github.com/TritonDataCenter/eng/blob/master/tools/mk/Makefile.agent_prebuilt.targ),
168168
and
169-
[`agent-prebuilt.sh`](https://github.com/joyent/eng/blob/master/tools/agent_prebuilt.sh)
169+
[`agent-prebuilt.sh`](https://github.com/TritonDataCenter/eng/blob/master/tools/agent_prebuilt.sh)
170170
files, likely appearing as a git submodule beneath `deps/eng` in the
171171
component repository.
172172

@@ -188,9 +188,9 @@ points the repo at your local dependency:
188188
"dependencies": {
189189
"assert-plus": "0.1.1",
190190
"bunyan": "0.16.6",
191-
- "checker": "git://github.com/joyent/node-checker#master",
191+
- "checker": "git://github.com/TritonDataCenter/node-checker#master",
192192
+ "checker": "git://github.com/davepacheco/node-checker#master",
193-
"moray": "git://github.com/joyent/node-moray.git#master",
193+
"moray": "git://github.com/TritonDataCenter/node-moray.git#master",
194194
"posix-getopt": "1.0.0",
195195
"pg": "0.11.3",
196196

docs/mantav2.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ currently available in a feature branch of their respective git repositories.
7373
#### Node.js client
7474

7575
The Node.js Manta client is developed in the
76-
[joyent/node-manta](https://github.com/joyent/node-manta) repository.
76+
[joyent/node-manta](https://github.com/TritonDataCenter/node-manta) repository.
7777

78-
- mantav1: Currently on the ["master" branch](https://github.com/joyent/node-manta/tree/master/)
78+
- mantav1: Currently on the ["master" branch](https://github.com/TritonDataCenter/node-manta/tree/master/)
7979
of joyent/node-manta, and published to npm as
8080
["manta"](https://www.npmjs.com/package/manta) -- i.e. `npm install manta`.
81-
- mantav2: Currently on the ["buckets" branch](https://github.com/joyent/node-manta/tree/buckets/)
81+
- mantav2: Currently on the ["buckets" branch](https://github.com/TritonDataCenter/node-manta/tree/buckets/)
8282
of joyent/node-manta. It is not yet published to npm.
8383

8484
*(The intent is to eventually move mantav2 to the "master" branch and publish it
@@ -89,11 +89,11 @@ to publish to npm as "manta".)*
8989
#### Java client
9090

9191
The Java Manta client is developed in the
92-
[joyent/java-manta](https://github.com/joyent/java-manta) repository.
92+
[joyent/java-manta](https://github.com/TritonDataCenter/java-manta) repository.
9393

94-
- mantav1: Currently on the ["master" branch](https://github.com/joyent/java-manta/tree/master/)
94+
- mantav1: Currently on the ["master" branch](https://github.com/TritonDataCenter/java-manta/tree/master/)
9595
of joyent/java-manta. Current release versions are 3.x.
96-
- mantav2: Currently on the ["buckets-m1" branch](https://github.com/joyent/java-manta/tree/buckets-m1/)
96+
- mantav2: Currently on the ["buckets-m1" branch](https://github.com/TritonDataCenter/java-manta/tree/buckets-m1/)
9797
of joyent/java-manta.
9898

9999
*(The intent is to eventually move mantav2 to the "master" branch and release it
@@ -104,7 +104,7 @@ continue to release as 3.x versions.)*
104104
## Is mantav1 still supported?
105105

106106
Operation of a Mantav1 per the [mantav1 Operator
107-
Guide](https://github.com/joyent/manta/blob/mantav1/docs/operator-guide.md)
107+
Guide](https://github.com/TritonDataCenter/manta/blob/mantav1/docs/operator-guide.md)
108108
remains unchanged, other than that operators should look for images named
109109
`mantav1-$servicename` rather than `manta-$servicename`. For example:
110110

docs/operator-guide/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Manta Operator Guide
22

33
*(Note: This is the operator guide for
4-
[Mantav2](https://github.com/joyent/manta/blob/master/docs/mantav2.md). If you
4+
[Mantav2](https://github.com/TritonDataCenter/manta/blob/master/docs/mantav2.md). If you
55
are operating a mantav1 deployment, please see the [Mantav1 Operator
6-
Guide](https://github.com/joyent/manta/blob/mantav1/docs/operator-guide.md).)*
6+
Guide](https://github.com/TritonDataCenter/manta/blob/mantav1/docs/operator-guide.md).)*
77

88
This operator guide is divided into sections:
99

0 commit comments

Comments
 (0)