Skip to content

TOOLS-2574 Purge dependency on us-east.manta.joyent.com name #1062

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.

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fi
# We configure the projects framework using a 'configure-projects' file. This
# is a plain text file which contains the project name, the branch we wish to
# build it at, and either a URL to a git repository or 'origin' to denote the
# github.com/joyent/<repo> location. See create_projects.
# github.com/TritonDataCenter/<repo> location. See create_projects.
#
read -r -d '' configure_projects < default.configure-projects

Expand Down Expand Up @@ -154,7 +154,7 @@ function checkout_project
function create_projects
{
local dir="projects/local"
local git_stem="https://github.com/joyent"
local git_stem="https://github.com/TritonDataCenter"

[[ -d "$dir" ]] || mkdir -p "$dir" || fatal "failed to create $dir"

Expand Down
17 changes: 9 additions & 8 deletions src/dockerinit/mdata-client/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# mdata-client

This repository contains metadata retrieval and manipulation tools for use
within guests of the SmartOS (and SDC) hypervisor. These guests may be either
SmartOS Zones or KVM virtual machines.
within guests of the SmartOS (and Triton) hypervisor. These guests may be
either SmartOS Zones or KVM virtual machines.

This repository is part of the Joyent SmartDataCenter project (SDC). For
contribution guidelines, issues, and general documentation, visit the main
[SDC](http://github.com/joyent/sdc) project page.
This repository is part of the Triton Data Center project (formerly known as
SmartDataCenter, hence SDC). For contribution guidelines, issues, and
general documentation, visit the main
[Triton](http://github.com/TritonDataCenter/triton) project page.

# Commands

Expand Down Expand Up @@ -45,9 +46,9 @@ is absolutely welcome.

MIT (See _LICENSE_.)

[mdata_docs]: http://eng.joyent.com/mdata/
[protocol]: http://eng.joyent.com/mdata/protocol.html
[datadict]: http://eng.joyent.com/mdata/datadict.html
[mdata_docs]: http://eng.tritondatacenter.com/mdata/
[protocol]: http://eng.tritondatacenter.com/mdata/protocol.html
[datadict]: http://eng.tritondatacenter.com/mdata/datadict.html
[mdata_get]: http://smartos.org/man/8/mdata-get
[mdata_delete]: http://smartos.org/man/8/mdata-delete
[mdata_put]: http://smartos.org/man/8/mdata-put
Expand Down
4 changes: 2 additions & 2 deletions src/dockerinit/mdata-client/debian/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: joyent-mdata-client
Maintainer: Joshua M. Clulow <jmc@joyent.com>
Maintainer: SmartOS Community <smartos-discuss@lists.smartos.org>
Section: misc
Priority: optional
Standards-Version: 3.9.4
Expand All @@ -8,6 +8,6 @@ Build-Depends: debhelper (>= 8)
Package: joyent-mdata-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Homepage: https://github.com/joyent/mdata-client
Homepage: https://github.com/TritonDataCenter/mdata-client
Description: Metadata client tools for use in guest virtual machines
hosted on a SmartOS hypervisor.
8 changes: 4 additions & 4 deletions src/fw/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# fwadm

Repository: <https://github.com/joyent/smartos-live.git>
Browsing: <https://github.com/joyent/smartos-live/tree/master/src/fw>
Repository: <https://github.com/TritonDataCenter/smartos-live.git>
Browsing: <https://github.com/TritonDataCenter/smartos-live/tree/master/src/fw>
Who: SmartOS mailing list <smartos-discuss@lists.smartos.org>
Docs: <https://github.com/joyent/smartos-live/tree/master/src/fw/README.md>
Tickets/bugs: <https://github.com/joyent/smartos-live/issues>
Docs: <https://github.com/TritonDataCenter/smartos-live/tree/master/src/fw/README.md>
Tickets/bugs: <https://github.com/TritonDataCenter/smartos-live/issues>


# Overview
Expand Down
2 changes: 1 addition & 1 deletion src/fw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "fw",
"description": "Administrative tool for managing SmartOS VM firewalls",
"version": "1.2.2",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

XXX KEBE ASKS, version bump?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we don't publish this to NPM or use it elsewhere AFAICT so I don't think it matters much, probably wouldn't hurt to bump patch though while where here.

"author": "Joyent (joyent.com)",
"author": "SmartOS (smartos.org)",
"private": true,
"main": "./lib/fw.js",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/fw/test/node_modules/nodeunit/bin/nodeunit

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/img/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Known issues:

## 3.9.3

- joyent/smartos-live#771 imgadm vacuum will try to reap images used by bhyve vms
- TritonDataCenter/smartos-live#771 imgadm vacuum will try to reap images used by bhyve vms

## 3.9.2

Expand All @@ -39,7 +39,7 @@ Known issues:

## 3.8.0

- joyent/imgadm#644 Update imgadm to use newer docker-registry-client so it can
- TritonDataCenter/imgadm#644 Update imgadm to use newer docker-registry-client so it can
pull from v2 registries. Docker v1 registry pulls are no longer supported.

## 3.7.4
Expand Down Expand Up @@ -175,7 +175,7 @@ Known issues:

## 3.0.0

- [joyent/smartos-live#120] Support using a HTTP(S) proxy via
- [TritonDataCenter/smartos-live#120] Support using a HTTP(S) proxy via
the `https_proxy` or `http_proxy` environment variable.

- Docker image import: both in importing images of `type=docker` from an
Expand Down Expand Up @@ -245,7 +245,7 @@ Known issues:

## 2.6.12

- [OS-2981, joyent/smartos-live#322] Fix 'imgadm avail' crash with a DSAPI
- [OS-2981, TritonDataCenter/smartos-live#322] Fix 'imgadm avail' crash with a DSAPI
image source.


Expand Down
4 changes: 2 additions & 2 deletions src/img/node_modules/imgmanifest/lib/imgmanifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/img/node_modules/imgmanifest/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/img/node_modules/sdc-clients/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/piadm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ getbootable() {
numbootfs=${#allbootfs[@]}
}

# NOTE: If/when we change the uname information, we'll need to change the sed.
declare activestamp
activestamp=$(uname -v | sed 's/joyent_//g')
declare installstamp
Expand Down
3 changes: 2 additions & 1 deletion src/vm/lib/metadata/agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright 2019 Joyent, Inc.
* Copyright 2022 MNX Cloud, Inc.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need copyright update.

*
*
* # OVERVIEW
Expand Down Expand Up @@ -66,7 +67,7 @@
* With a socket created and the server listening, the client in the zone can
* make queries using the metadata protocol described at:
*
* https://eng.joyent.com/mdata/protocol.html
* https://eng.tritondatacenter.com/mdata/protocol.html
*
*
* # CLEANUP AND ERRORS
Expand Down
4 changes: 2 additions & 2 deletions src/vm/node_modules/macaddr/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions src/vm/node_modules/triton-netconfig/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/vm/node_modules/vasync/package.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/vm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vmadm",
"description": "administrative tool(s) for managing VMs",
"version": "1.0.5",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version bump?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like the same situation as the fw module. I don't believe it's used outside of smartos live, a version bump wouldn't hurt but I don't think it's necessary either.

"author": "Joyent (joyent.com)",
"author": "Triton Data Center (tritondatacenter.com)",
"private": true,
"devDependencies": {
},
Expand Down
3 changes: 2 additions & 1 deletion src/vm/tests/test-validate-payload.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright 2015 Joyent, Inc. All rights reserved.
// Copyright 2022 MNX Cloud, Inc.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copyright update?


var brand;
var os_brands = ['joyent', 'joyent-minimal'];
Expand Down Expand Up @@ -534,7 +535,7 @@ for (brand in os_brands) {
image_uuid: '01b2c898-945f-11e1-a523-af1afbe22822',
delegate_dataset: 'true',
do_not_inventory: 'true',
dns_domain: 'joyent.com',
dns_domain: 'tritondatacenter.com',
filesystems: [{type: 'lofs', source: '/var/tmp', target: '/gztmp', options: ['ro', 'nodevices']}],
fs_allowed: ['ufs', 'tmpfs', 'pcfs'],
hostname: 'maximumpower',
Expand Down
2 changes: 1 addition & 1 deletion tools/jr-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"jrVersion": 1,
"description": "SmartOS platform public repositories",
"repoCandidateSearch": {
"description": "public github.com/joyent repos directly relevant to development of SmartOS",
"description": "public github.com/TritonDataCenter repos directly relevant to development of SmartOS",
"type": "public",
"includeArchived": false
},
Expand Down
6 changes: 3 additions & 3 deletions tools/smartos-release
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# This script is run as part of the biweekly SmartOS release process. It
# uploads the release artifacts from the platform build bits directory to
# ~~/public/SmartOS/<timestamp>/ , for processing
# by the https://github.com/joyent/smartos-changelog generator, and uploads
# the 'latest' release artifacts to ~~/public/SmartOS/*-latest.* to preserve
# compatibility with scripts that expect to find them there.
# by the https://github.com/TritonDataCenter/smartos-changelog generator,
# and uploads the 'latest' release artifacts to ~~/public/SmartOS/*-latest.*
# to preserve compatibility with scripts that expect to find them there.
#

# Update the SmartOS release directory
Expand Down