From c749a28662f9a46066dcd39e2bc582f470339f5c Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 17 Jan 2017 00:58:03 -0800 Subject: [PATCH] *: Rename coreos-baremetal to matchbox --- Documentation/deployment.md | 20 +++++----- Documentation/dev/release.md | 20 +++++----- Documentation/getting-started-docker.md | 6 +-- Documentation/getting-started-rkt.md | 6 +-- Documentation/index.md | 4 +- Documentation/matchbox.md | 2 +- Makefile | 38 +++++++++---------- README.md | 11 ++---- build | 6 +-- cmd/bootcmd/main.go | 2 +- cmd/matchbox/main.go | 14 +++---- contrib/systemd/matchbox-for-tectonic.service | 2 +- contrib/systemd/matchbox-local.service | 2 +- contrib/systemd/matchbox-on-coreos.service | 2 +- contrib/systemd/matchbox.service | 2 +- examples/etc/matchbox/README.md | 2 +- glide.yaml | 2 +- matchbox/cli/group_create.go | 4 +- matchbox/cli/group_describe.go | 2 +- matchbox/cli/group_list.go | 2 +- matchbox/cli/ignition_create.go | 2 +- matchbox/cli/profile_create.go | 4 +- matchbox/cli/profile_describe.go | 2 +- matchbox/cli/profile_list.go | 2 +- matchbox/cli/root.go | 4 +- matchbox/client/client.go | 2 +- matchbox/http/cloud.go | 4 +- matchbox/http/cloud_test.go | 6 +-- matchbox/http/context.go | 2 +- matchbox/http/context_test.go | 2 +- matchbox/http/generic.go | 4 +- matchbox/http/generic_test.go | 6 +-- matchbox/http/handlers.go | 4 +- matchbox/http/handlers_test.go | 6 +-- matchbox/http/ignition.go | 4 +- matchbox/http/ignition_test.go | 6 +-- matchbox/http/ipxe_test.go | 4 +- matchbox/http/metadata_test.go | 2 +- matchbox/http/parse.go | 2 +- matchbox/http/pixiecore.go | 4 +- matchbox/http/pixiecore_test.go | 6 +-- matchbox/http/server.go | 4 +- matchbox/http/test_fixtures.go | 2 +- matchbox/rpc/errors.go | 2 +- matchbox/rpc/errors_test.go | 2 +- matchbox/rpc/groups.go | 6 +-- matchbox/rpc/grpc.go | 4 +- matchbox/rpc/ignition.go | 6 +-- matchbox/rpc/profiles.go | 6 +-- matchbox/rpc/rpcpb/rpc.pb.go | 2 +- matchbox/rpc/rpcpb/rpc.proto | 2 +- matchbox/rpc/select.go | 6 +-- matchbox/server/server.go | 6 +-- matchbox/server/server_test.go | 8 ++-- matchbox/server/serverpb/messages.pb.go | 2 +- matchbox/server/serverpb/messages.proto | 2 +- matchbox/storage/filestore.go | 2 +- matchbox/storage/filestore_test.go | 4 +- matchbox/storage/storage.go | 2 +- matchbox/storage/testfakes/broken_store.go | 2 +- matchbox/storage/testfakes/empty_store.go | 2 +- matchbox/storage/testfakes/fixed_store.go | 2 +- matchbox/storage/testfakes/fixtures.go | 2 +- mkdocs.yml | 2 +- 64 files changed, 151 insertions(+), 154 deletions(-) diff --git a/Documentation/deployment.md b/Documentation/deployment.md index 525d0997..33114461 100644 --- a/Documentation/deployment.md +++ b/Documentation/deployment.md @@ -18,26 +18,26 @@ Choose one of the supported installation options: ## Download -Download the latest coreos-baremetal [release](https://github.com/coreos/coreos-baremetal/releases) to the provisioner host. +Download the latest matchbox [release](https://github.com/coreos/matchbox/releases) to the provisioner host. ```sh -$ wget https://github.com/coreos/coreos-baremetal/releases/download/v0.4.2/coreos-baremetal-v0.4.2-linux-amd64.tar.gz -$ wget https://github.com/coreos/coreos-baremetal/releases/download/v0.4.2/coreos-baremetal-v0.4.2-linux-amd64.tar.gz.asc +$ wget https://github.com/coreos/matchbox/releases/download/v0.4.2/matchbox-v0.4.2-linux-amd64.tar.gz +$ wget https://github.com/coreos/matchbox/releases/download/v0.4.2/matchbox-v0.4.2-linux-amd64.tar.gz.asc ``` Verify the release has been signed by the [CoreOS App Signing Key](https://coreos.com/security/app-signing-key/). ``` $ gpg --keyserver pgp.mit.edu --recv-key 18AD5014C99EF7E3BA5F6CE950BDD3E0FC8A365E -$ gpg --verify coreos-baremetal-v0.4.2-linux-amd64.tar.gz.asc coreos-baremetal-v0.4.2-linux-amd64.tar.gz +$ gpg --verify matchbox-v0.4.2-linux-amd64.tar.gz.asc matchbox-v0.4.2-linux-amd64.tar.gz # gpg: Good signature from "CoreOS Application Signing Key " ``` Untar the release. ```sh -$ tar xzvf coreos-baremetal-v0.4.2-linux-amd64.tar.gz -$ cd coreos-baremetal-v0.4.2-linux-amd64 +$ tar xzvf matchbox-v0.4.2-linux-amd64.tar.gz +$ cd matchbox-v0.4.2-linux-amd64 ``` ## Install @@ -241,19 +241,19 @@ For large production environments, use a cache proxy or mirror suitable for your ## Network -Review [network setup](https://github.com/coreos/coreos-baremetal/blob/master/Documentation/network-setup.md) with your network administrator to set up DHCP, TFTP, and DNS services on your network. At a high level, your goals are to: +Review [network setup](https://github.com/coreos/matchbox/blob/master/Documentation/network-setup.md) with your network administrator to set up DHCP, TFTP, and DNS services on your network. At a high level, your goals are to: * Chainload PXE firmwares to iPXE * Point iPXE client machines to the `matchbox` iPXE HTTP endpoint `http://matchbox.example.com:8080/boot.ipxe` * Ensure `matchbox.example.com` resolves to your `matchbox` deployment -CoreOS provides [dnsmasq](https://github.com/coreos/coreos-baremetal/tree/master/contrib/dnsmasq) as `quay.io/coreos/dnsmasq`, if you wish to use rkt or Docker. +CoreOS provides [dnsmasq](https://github.com/coreos/matchbox/tree/master/contrib/dnsmasq) as `quay.io/coreos/dnsmasq`, if you wish to use rkt or Docker. ## rkt Run the container image with rkt. -latest or most recent tagged `matchbox` [release](https://github.com/coreos/coreos-baremetal/releases) ACI. Trust the [CoreOS App Signing Key](https://coreos.com/security/app-signing-key/) for image signature verification. +latest or most recent tagged `matchbox` [release](https://github.com/coreos/matchbox/releases) ACI. Trust the [CoreOS App Signing Key](https://coreos.com/security/app-signing-key/) for image signature verification. ```sh $ sudo rkt run --net=host --mount volume=data,target=/var/lib/matchbox --volume data,kind=host,source=/var/lib/matchbox quay.io/coreos/matchbox:latest --mount volume=config,target=/etc/matchbox --volume config,kind=host,source=/etc/matchbox,readOnly=true -- -address=0.0.0.0:8080 -rpc-address=0.0.0.0:8081 -log-level=debug @@ -293,4 +293,4 @@ The example manifests use Kubernetes `emptyDir` volumes to back the `matchbox` F ### Documentation -View the [documentation](https://github.com/coreos/coreos-baremetal#coreos-on-baremetal) for `matchbox` service docs, tutorials, example clusters and Ignition configs, PXE booting guides, or machine lifecycle guides. +View the [documentation](https://github.com/coreos/matchbox#coreos-on-baremetal) for `matchbox` service docs, tutorials, example clusters and Ignition configs, PXE booting guides, or machine lifecycle guides. diff --git a/Documentation/dev/release.md b/Documentation/dev/release.md index 8dde3c43..a815d049 100644 --- a/Documentation/dev/release.md +++ b/Documentation/dev/release.md @@ -1,7 +1,7 @@ # Release Guide -This guide covers releasing new versions of coreos-baremetal. +This guide covers releasing new versions of matchbox. ## Version @@ -37,7 +37,7 @@ Build the release tarballs. Verify the reported version. - ./_output/coreos-baremetal-v0.4.2-linux-amd64/matchbox -version + ./_output/matchbox-v0.4.2-linux-amd64/matchbox -version ## ACI @@ -59,18 +59,18 @@ Sign the release tarballs and ACI with a [CoreOS App Signing Key](https://coreos cd _output gpg2 -a --default-key FC8A365E --detach-sign matchbox-$VERSION-linux-amd64.aci - gpg2 -a --default-key FC8A365E --detach-sign coreos-baremetal-$VERSION-linux-amd64.tar.gz - gpg2 -a --default-key FC8A365E --detach-sign coreos-baremetal-$VERSION-darwin-amd64.tar.gz - gpg2 -a --default-key FC8A365E --detach-sign coreos-baremetal-$VERSION-linux-arm.tar.gz - gpg2 -a --default-key FC8A365E --detach-sign coreos-baremetal-$VERSION-linux-arm64.tar.gz + gpg2 -a --default-key FC8A365E --detach-sign matchbox-$VERSION-linux-amd64.tar.gz + gpg2 -a --default-key FC8A365E --detach-sign matchbox-$VERSION-darwin-amd64.tar.gz + gpg2 -a --default-key FC8A365E --detach-sign matchbox-$VERSION-linux-arm.tar.gz + gpg2 -a --default-key FC8A365E --detach-sign matchbox-$VERSION-linux-arm64.tar.gz Verify the signatures. gpg2 --verify matchbox-$VERSION-linux-amd64.aci.asc matchbox-$VERSION-linux-amd64.aci - gpg2 --verify coreos-baremetal-$VERSION-linux-amd64.tar.gz.asc coreos-baremetal-$VERSION-linux-amd64.tar.gz - gpg2 --verify coreos-baremetal-$VERSION-darwin-amd64.tar.gz.asc coreos-baremetal-$VERSION-darwin-amd64.tar.gz - gpg2 --verify coreos-baremetal-$VERSION-linux-arm.tar.gz.asc coreos-baremetal-$VERSION-linux-arm.tar.gz - gpg2 --verify coreos-baremetal-$VERSION-linux-arm64.tar.gz.asc coreos-baremetal-$VERSION-linux-arm64.tar.gz + gpg2 --verify matchbox-$VERSION-linux-amd64.tar.gz.asc matchbox-$VERSION-linux-amd64.tar.gz + gpg2 --verify matchbox-$VERSION-darwin-amd64.tar.gz.asc matchbox-$VERSION-darwin-amd64.tar.gz + gpg2 --verify matchbox-$VERSION-linux-arm.tar.gz.asc matchbox-$VERSION-linux-arm.tar.gz + gpg2 --verify matchbox-$VERSION-linux-arm64.tar.gz.asc matchbox-$VERSION-linux-arm64.tar.gz ## Publish diff --git a/Documentation/getting-started-docker.md b/Documentation/getting-started-docker.md index 5919c218..86d69df2 100644 --- a/Documentation/getting-started-docker.md +++ b/Documentation/getting-started-docker.md @@ -17,10 +17,10 @@ Install the package dependencies and start the Docker daemon. # check Docker's docs to install Docker 1.8+ on Debian/Ubuntu sudo apt-get install virt-manager virtinst qemu-kvm -Clone the [coreos-baremetal](https://github.com/coreos/coreos-baremetal) source which contains the examples and scripts. +Clone the [matchbox](https://github.com/coreos/matchbox) source which contains the examples and scripts. - git clone https://github.com/coreos/coreos-baremetal.git - cd coreos-baremetal + git clone https://github.com/coreos/matchbox.git + cd matchbox Download CoreOS image assets referenced by the `etcd-docker` [example](../examples) to `examples/assets`. diff --git a/Documentation/getting-started-rkt.md b/Documentation/getting-started-rkt.md index d85aab7d..4e5a9f5d 100644 --- a/Documentation/getting-started-rkt.md +++ b/Documentation/getting-started-rkt.md @@ -19,10 +19,10 @@ Next, install the package dependencies. **Note**: rkt does not yet integrate with SELinux on Fedora. As a workaround, temporarily set enforcement to permissive if you are comfortable (`sudo setenforce Permissive`). Check the rkt [distribution notes](https://github.com/coreos/rkt/blob/master/Documentation/distributions.md) or see the tracking [issue](https://github.com/coreos/rkt/issues/1727). -Clone the [coreos-baremetal](https://github.com/coreos/coreos-baremetal) source which contains the examples and scripts. +Clone the [matchbox](https://github.com/coreos/matchbox) source which contains the examples and scripts. - git clone https://github.com/coreos/coreos-baremetal.git - cd coreos-baremetal + git clone https://github.com/coreos/matchbox.git + cd matchbox Download CoreOS image assets referenced by the `etcd` [example](../examples) to `examples/assets`. diff --git a/Documentation/index.md b/Documentation/index.md index f090d70d..b3c597d0 100644 --- a/Documentation/index.md +++ b/Documentation/index.md @@ -24,7 +24,7 @@ Guides and a service for network booting and provisioning CoreOS clusters on vir * [matchbox with Docker](getting-started-docker.md) * [Configuration](config.md) * [HTTP API](api.md) -* [gRPC API](https://godoc.org/github.com/coreos/coreos-baremetal/matchbox/client) +* [gRPC API](https://godoc.org/github.com/coreos/matchbox/matchbox/client) * Installation * [CoreOS / Linux distros](deployment.md) * [rkt](deployment.md#rkt) / [docker](deployment.md#docker) @@ -43,7 +43,7 @@ Guides and a service for network booting and provisioning CoreOS clusters on vir ### Examples -The [examples](https://github.com/coreos/coreos-baremetal/tree/master/examples) network boot and provision CoreOS clusters. Network boot QEMU/KVM VMs to try the examples on your Linux laptop. +The [examples](https://github.com/coreos/matchbox/tree/master/examples) network boot and provision CoreOS clusters. Network boot QEMU/KVM VMs to try the examples on your Linux laptop. * Multi-node [Kubernetes cluster](kubernetes.md) * Multi-node [rktnetes](rktnetes.md) cluster (i.e. Kubernetes with rkt as the container runtime) diff --git a/Documentation/matchbox.md b/Documentation/matchbox.md index 76847e3f..441937ff 100644 --- a/Documentation/matchbox.md +++ b/Documentation/matchbox.md @@ -21,7 +21,7 @@ See [configuration](config.md) flags and variables. ## API * [HTTP API](api.md) -* [gRPC API](https://godoc.org/github.com/coreos/coreos-baremetal/matchbox/client) +* [gRPC API](https://godoc.org/github.com/coreos/matchbox/matchbox/client) ## Data diff --git a/Makefile b/Makefile index 6c67f74e..d765aed3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ export CGO_ENABLED:=0 -LD_FLAGS="-w -X github.com/coreos/coreos-baremetal/matchbox/version.Version=$(shell ./git-version)" +LD_FLAGS="-w -X github.com/coreos/matchbox/matchbox/version.Version=$(shell ./git-version)" LOCAL_BIN=/usr/local/bin all: build @@ -13,10 +13,10 @@ codegen: tools ./scripts/codegen bin/matchbox: - go build -o bin/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/matchbox + go build -o bin/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/matchbox bin/bootcmd: - go build -o bin/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/bootcmd + go build -o bin/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/bootcmd test: ./test @@ -27,42 +27,42 @@ install: release: \ clean \ - _output/coreos-baremetal-linux-amd64.tar.gz \ - _output/coreos-baremetal-linux-arm.tar.gz \ - _output/coreos-baremetal-linux-arm64.tar.gz \ - _output/coreos-baremetal-darwin-amd64.tar.gz \ + _output/matchbox-linux-amd64.tar.gz \ + _output/matchbox-linux-arm.tar.gz \ + _output/matchbox-linux-arm64.tar.gz \ + _output/matchbox-darwin-amd64.tar.gz \ # matchbox bin/linux-amd64/matchbox: - GOOS=linux GOARCH=amd64 go build -o bin/linux-amd64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/matchbox + GOOS=linux GOARCH=amd64 go build -o bin/linux-amd64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/matchbox bin/linux-arm/matchbox: - GOOS=linux GOARCH=arm go build -o bin/linux-arm/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/matchbox + GOOS=linux GOARCH=arm go build -o bin/linux-arm/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/matchbox bin/linux-arm64/matchbox: - GOOS=linux GOARCH=arm64 go build -o bin/linux-arm64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/matchbox + GOOS=linux GOARCH=arm64 go build -o bin/linux-arm64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/matchbox bin/darwin-amd64/matchbox: - GOOS=darwin GOARCH=amd64 go build -o bin/darwin-amd64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/matchbox + GOOS=darwin GOARCH=amd64 go build -o bin/darwin-amd64/matchbox -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/matchbox # bootcmd bin/linux-amd64/bootcmd: - GOOS=linux GOARCH=amd64 go build -o bin/linux-amd64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/bootcmd + GOOS=linux GOARCH=amd64 go build -o bin/linux-amd64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/bootcmd bin/linux-arm/bootcmd: - GOOS=linux GOARCH=arm go build -o bin/linux-arm/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/bootcmd + GOOS=linux GOARCH=arm go build -o bin/linux-arm/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/bootcmd bin/linux-arm64/bootcmd: - GOOS=linux GOARCH=arm64 go build -o bin/linux-arm64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/bootcmd + GOOS=linux GOARCH=arm64 go build -o bin/linux-arm64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/bootcmd bin/darwin-amd64/bootcmd: - GOOS=darwin GOARCH=amd64 go build -o bin/darwin-amd64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/coreos-baremetal/cmd/bootcmd + GOOS=darwin GOARCH=amd64 go build -o bin/darwin-amd64/bootcmd -ldflags $(LD_FLAGS) -a github.com/coreos/matchbox/cmd/bootcmd -_output/coreos-baremetal-%.tar.gz: NAME=coreos-baremetal-$(VERSION)-$* -_output/coreos-baremetal-%.tar.gz: DEST=_output/$(NAME) -_output/coreos-baremetal-%.tar.gz: bin/%/matchbox bin/%/bootcmd +_output/matchbox-%.tar.gz: NAME=matchbox-$(VERSION)-$* +_output/matchbox-%.tar.gz: DEST=_output/$(NAME) +_output/matchbox-%.tar.gz: bin/%/matchbox bin/%/bootcmd mkdir -p $(DEST) cp bin/$*/matchbox $(DEST) cp bin/$*/bootcmd $(DEST) @@ -75,5 +75,5 @@ clean: rm -rf _output .PHONY: all build tools test install release clean -.SECONDARY: _output/coreos-baremetal-linux-amd64 _output/coreos-baremetal-darwin-amd64 +.SECONDARY: _output/matchbox-linux-amd64 _output/matchbox-darwin-amd64 diff --git a/README.md b/README.md index 972e6fdb..604d9b8f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,8 @@ +# matchbox [![Build Status](https://travis-ci.org/coreos/matchbox.svg?branch=master)](https://travis-ci.org/coreos/matchbox) [![GoDoc](https://godoc.org/github.com/coreos/matchbox?status.png)](https://godoc.org/github.com/coreos/matchbox) [![Docker Repository on Quay](https://quay.io/repository/coreos/matchbox/status "Docker Repository on Quay")](https://quay.io/repository/coreos/matchbox) [![IRC](https://img.shields.io/badge/irc-%23coreos-449FD8.svg)](https://botbot.me/freenode/coreos) -# CoreOS on Baremetal +Network boot and provision CoreOS clusters on virtual or physical hardware. -[![Build Status](https://travis-ci.org/coreos/coreos-baremetal.svg?branch=master)](https://travis-ci.org/coreos/coreos-baremetal) [![GoDoc](https://godoc.org/github.com/coreos/coreos-baremetal?status.png)](https://godoc.org/github.com/coreos/coreos-baremetal) [![Docker Repository on Quay](https://quay.io/repository/coreos/matchbox/status "Docker Repository on Quay")](https://quay.io/repository/coreos/matchbox) [![IRC](https://img.shields.io/badge/irc-%23coreos-449FD8.svg)](https://botbot.me/freenode/coreos) - -Guides and a service for network booting and provisioning CoreOS clusters on virtual or physical hardware. - -**Announcement**: coreos-baremetal and `bootcfg` are being renamed to CoreOS `matchbox`, which will be reflected in v0.5.0. Please see [CHANGES](CHANGES.md) or [#400](https://github.com/coreos/coreos-baremetal/issues/400). If you're looking for older docs, be sure to use the branch/tag switcher. +**Announcement**: coreos-baremetal and `bootcfg` have been renamed to CoreOS `matchbox`, which will be reflected in v0.5.0. Please see [CHANGES](CHANGES.md) or [#400](https://github.com/coreos/matchbox/issues/400). If you're looking for older docs, be sure to use the branch/tag switcher. ## Guides @@ -28,7 +25,7 @@ Guides and a service for network booting and provisioning CoreOS clusters on vir * [Cloud-Config](Documentation/cloud-config.md) * [Configuration](Documentation/config.md) * [HTTP API](Documentation/api.md) -* [gRPC API](https://godoc.org/github.com/coreos/coreos-baremetal/matchbox/client) +* [gRPC API](https://godoc.org/github.com/coreos/matchbox/matchbox/client) * Installation * [CoreOS / Linux distros](Documentation/deployment.md) * [rkt](Documentation/deployment.md#rkt) / [docker](Documentation/deployment.md#docker) diff --git a/build b/build index 0fb4746c..633c65d8 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/bin/bash -e -LD_FLAGS="-w -X github.com/coreos/coreos-baremetal/matchbox/version.Version=$(./git-version)" -CGO_ENABLED=0 go build -o bin/matchbox -ldflags "$LD_FLAGS" -a github.com/coreos/coreos-baremetal/cmd/matchbox +LD_FLAGS="-w -X github.com/coreos/matchbox/matchbox/version.Version=$(./git-version)" +CGO_ENABLED=0 go build -o bin/matchbox -ldflags "$LD_FLAGS" -a github.com/coreos/matchbox/cmd/matchbox # bootcmd CLI binary -CGO_ENABLED=0 go build -o bin/bootcmd -ldflags "$LD_FLAGS" -a github.com/coreos/coreos-baremetal/cmd/bootcmd +CGO_ENABLED=0 go build -o bin/bootcmd -ldflags "$LD_FLAGS" -a github.com/coreos/matchbox/cmd/bootcmd diff --git a/cmd/bootcmd/main.go b/cmd/bootcmd/main.go index 84a48db7..7a90e3a2 100644 --- a/cmd/bootcmd/main.go +++ b/cmd/bootcmd/main.go @@ -1,6 +1,6 @@ package main -import "github.com/coreos/coreos-baremetal/matchbox/cli" +import "github.com/coreos/matchbox/matchbox/cli" func main() { cli.Execute() diff --git a/cmd/matchbox/main.go b/cmd/matchbox/main.go index 134ba737..fa19cfda 100644 --- a/cmd/matchbox/main.go +++ b/cmd/matchbox/main.go @@ -11,13 +11,13 @@ import ( "github.com/Sirupsen/logrus" "github.com/coreos/pkg/flagutil" - web "github.com/coreos/coreos-baremetal/matchbox/http" - "github.com/coreos/coreos-baremetal/matchbox/rpc" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/sign" - "github.com/coreos/coreos-baremetal/matchbox/storage" - "github.com/coreos/coreos-baremetal/matchbox/tlsutil" - "github.com/coreos/coreos-baremetal/matchbox/version" + web "github.com/coreos/matchbox/matchbox/http" + "github.com/coreos/matchbox/matchbox/rpc" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/sign" + "github.com/coreos/matchbox/matchbox/storage" + "github.com/coreos/matchbox/matchbox/tlsutil" + "github.com/coreos/matchbox/matchbox/version" ) var ( diff --git a/contrib/systemd/matchbox-for-tectonic.service b/contrib/systemd/matchbox-for-tectonic.service index 818baf85..58f2e6e9 100644 --- a/contrib/systemd/matchbox-for-tectonic.service +++ b/contrib/systemd/matchbox-for-tectonic.service @@ -1,6 +1,6 @@ [Unit] Description=CoreOS matchbox Server -Documentation=https://github.com/coreos/coreos-baremetal +Documentation=https://github.com/coreos/matchbox [Service] Environment="IMAGE=quay.io/coreos/matchbox" diff --git a/contrib/systemd/matchbox-local.service b/contrib/systemd/matchbox-local.service index ac73219f..39dd9a24 100644 --- a/contrib/systemd/matchbox-local.service +++ b/contrib/systemd/matchbox-local.service @@ -1,6 +1,6 @@ [Unit] Description=CoreOS matchbox Server -Documentation=https://github.com/coreos/coreos-baremetal +Documentation=https://github.com/coreos/matchbox [Service] User=matchbox diff --git a/contrib/systemd/matchbox-on-coreos.service b/contrib/systemd/matchbox-on-coreos.service index 74c5eac2..a7749bce 100644 --- a/contrib/systemd/matchbox-on-coreos.service +++ b/contrib/systemd/matchbox-on-coreos.service @@ -1,6 +1,6 @@ [Unit] Description=CoreOS matchbox Server -Documentation=https://github.com/coreos/coreos-baremetal +Documentation=https://github.com/coreos/matchbox [Service] Environment="IMAGE=quay.io/coreos/matchbox" diff --git a/contrib/systemd/matchbox.service b/contrib/systemd/matchbox.service index e25f5bc6..5db6988f 100644 --- a/contrib/systemd/matchbox.service +++ b/contrib/systemd/matchbox.service @@ -1,6 +1,6 @@ [Unit] Description=CoreOS matchbox Server -Documentation=https://github.com/coreos/coreos-baremetal +Documentation=https://github.com/coreos/matchbox [Service] User=matchbox diff --git a/examples/etc/matchbox/README.md b/examples/etc/matchbox/README.md index d18238e1..5cae256f 100644 --- a/examples/etc/matchbox/README.md +++ b/examples/etc/matchbox/README.md @@ -7,7 +7,7 @@ Create FAKE TLS credentials for running the `matchbox` gRPC API examples. Navigate to the example directory which will be mounted as `/etc/matchbox` in examples: - cd coreos-baremetal/examples/etc/matchbox + cd matchbox/examples/etc/matchbox Set certificate subject alt names which should be used by exporting `SAN`. Use the DNS name or IP at which `matchbox` is hosted. diff --git a/glide.yaml b/glide.yaml index d7b1746b..04d37d6a 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/coreos/coreos-baremetal +package: github.com/coreos/matchbox import: - package: github.com/golang/protobuf version: 7cc19b78d562895b13596ddce7aafb59dd789318 diff --git a/matchbox/cli/group_create.go b/matchbox/cli/group_create.go index d1f1e332..d8ddd4a9 100644 --- a/matchbox/cli/group_create.go +++ b/matchbox/cli/group_create.go @@ -6,8 +6,8 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // groupPutCmd creates and updates Groups. diff --git a/matchbox/cli/group_describe.go b/matchbox/cli/group_describe.go index 87efd3d0..d1111fe5 100644 --- a/matchbox/cli/group_describe.go +++ b/matchbox/cli/group_describe.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // groupDescribeCmd describes a Group. diff --git a/matchbox/cli/group_list.go b/matchbox/cli/group_list.go index 445552b6..2238c886 100644 --- a/matchbox/cli/group_list.go +++ b/matchbox/cli/group_list.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // groupListCmd lists Groups. diff --git a/matchbox/cli/ignition_create.go b/matchbox/cli/ignition_create.go index cc3f4ae1..f0af2590 100644 --- a/matchbox/cli/ignition_create.go +++ b/matchbox/cli/ignition_create.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // ignitionPutCmd creates and updates Ignition templates. diff --git a/matchbox/cli/profile_create.go b/matchbox/cli/profile_create.go index d97c0c1a..8ba06351 100644 --- a/matchbox/cli/profile_create.go +++ b/matchbox/cli/profile_create.go @@ -6,8 +6,8 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // profilePutCmd creates and updates Profiles. diff --git a/matchbox/cli/profile_describe.go b/matchbox/cli/profile_describe.go index 4337e439..fc13be8d 100644 --- a/matchbox/cli/profile_describe.go +++ b/matchbox/cli/profile_describe.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // profileDescribeCmd describes a Profile. diff --git a/matchbox/cli/profile_list.go b/matchbox/cli/profile_list.go index 6866d41b..6f9bea76 100644 --- a/matchbox/cli/profile_list.go +++ b/matchbox/cli/profile_list.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // profileListCmd lists Profiles. diff --git a/matchbox/cli/root.go b/matchbox/cli/root.go index 54a68b49..49328f24 100644 --- a/matchbox/cli/root.go +++ b/matchbox/cli/root.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/coreos-baremetal/matchbox/client" - "github.com/coreos/coreos-baremetal/matchbox/tlsutil" + "github.com/coreos/matchbox/matchbox/client" + "github.com/coreos/matchbox/matchbox/tlsutil" ) var ( diff --git a/matchbox/client/client.go b/matchbox/client/client.go index 7b7cf0b2..30d8d7d1 100644 --- a/matchbox/client/client.go +++ b/matchbox/client/client.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" ) var ( diff --git a/matchbox/http/cloud.go b/matchbox/http/cloud.go index 9c655399..2e42651d 100644 --- a/matchbox/http/cloud.go +++ b/matchbox/http/cloud.go @@ -10,8 +10,8 @@ import ( "github.com/Sirupsen/logrus" cloudinit "github.com/coreos/coreos-cloudinit/config" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // CloudConfig defines a cloud-init config. diff --git a/matchbox/http/cloud_test.go b/matchbox/http/cloud_test.go index 497e570c..9a661e35 100644 --- a/matchbox/http/cloud_test.go +++ b/matchbox/http/cloud_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestCloudHandler(t *testing.T) { diff --git a/matchbox/http/context.go b/matchbox/http/context.go index e2e4be10..bd0f1f7d 100644 --- a/matchbox/http/context.go +++ b/matchbox/http/context.go @@ -5,7 +5,7 @@ import ( "context" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // unexported key prevents collisions diff --git a/matchbox/http/context_test.go b/matchbox/http/context_test.go index 2255045d..8756077c 100644 --- a/matchbox/http/context_test.go +++ b/matchbox/http/context_test.go @@ -6,7 +6,7 @@ import ( "context" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) func TestContextProfile(t *testing.T) { diff --git a/matchbox/http/generic.go b/matchbox/http/generic.go index 85ab5ffc..533d78bd 100644 --- a/matchbox/http/generic.go +++ b/matchbox/http/generic.go @@ -9,8 +9,8 @@ import ( "context" "github.com/Sirupsen/logrus" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // genericHandler returns a handler that responds with the generic config diff --git a/matchbox/http/generic_test.go b/matchbox/http/generic_test.go index 8da45dff..2a5ea71a 100644 --- a/matchbox/http/generic_test.go +++ b/matchbox/http/generic_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestGenericHandler(t *testing.T) { diff --git a/matchbox/http/handlers.go b/matchbox/http/handlers.go index abaae8d5..1bf63847 100644 --- a/matchbox/http/handlers.go +++ b/matchbox/http/handlers.go @@ -6,8 +6,8 @@ import ( "context" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // homeHandler shows the server name for rooted requests. Otherwise, a 404 is diff --git a/matchbox/http/handlers_test.go b/matchbox/http/handlers_test.go index a0f8eed6..d9819522 100644 --- a/matchbox/http/handlers_test.go +++ b/matchbox/http/handlers_test.go @@ -10,9 +10,9 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestSelectGroup(t *testing.T) { diff --git a/matchbox/http/ignition.go b/matchbox/http/ignition.go index 1a0a35b1..f36b9791 100644 --- a/matchbox/http/ignition.go +++ b/matchbox/http/ignition.go @@ -10,8 +10,8 @@ import ( fuze "github.com/coreos/fuze/config" ignition "github.com/coreos/ignition/config" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // ignitionHandler returns a handler that responds with the Ignition config diff --git a/matchbox/http/ignition_test.go b/matchbox/http/ignition_test.go index 6ecc16bf..22f86a1c 100644 --- a/matchbox/http/ignition_test.go +++ b/matchbox/http/ignition_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestIgnitionHandler_V2JSON(t *testing.T) { diff --git a/matchbox/http/ipxe_test.go b/matchbox/http/ipxe_test.go index fb8b006c..223f2c4d 100644 --- a/matchbox/http/ipxe_test.go +++ b/matchbox/http/ipxe_test.go @@ -9,8 +9,8 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestIPXEInspect(t *testing.T) { diff --git a/matchbox/http/metadata_test.go b/matchbox/http/metadata_test.go index e11ff753..3661e3a5 100644 --- a/matchbox/http/metadata_test.go +++ b/matchbox/http/metadata_test.go @@ -11,7 +11,7 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) func TestMetadataHandler(t *testing.T) { diff --git a/matchbox/http/parse.go b/matchbox/http/parse.go index 352bec31..fee35096 100644 --- a/matchbox/http/parse.go +++ b/matchbox/http/parse.go @@ -8,7 +8,7 @@ import ( "github.com/Sirupsen/logrus" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // collectVariables collects group selectors, metadata, and request-scoped diff --git a/matchbox/http/pixiecore.go b/matchbox/http/pixiecore.go index b07ea831..217fffec 100644 --- a/matchbox/http/pixiecore.go +++ b/matchbox/http/pixiecore.go @@ -7,8 +7,8 @@ import ( "context" "github.com/Sirupsen/logrus" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // pixiecoreHandler returns a handler that renders the boot config JSON for diff --git a/matchbox/http/pixiecore_test.go b/matchbox/http/pixiecore_test.go index d372469b..f5be8308 100644 --- a/matchbox/http/pixiecore_test.go +++ b/matchbox/http/pixiecore_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/Sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestPixiecoreHandler(t *testing.T) { diff --git a/matchbox/http/server.go b/matchbox/http/server.go index de3f78bb..d03d657c 100644 --- a/matchbox/http/server.go +++ b/matchbox/http/server.go @@ -5,8 +5,8 @@ import ( "github.com/Sirupsen/logrus" - "github.com/coreos/coreos-baremetal/matchbox/server" - "github.com/coreos/coreos-baremetal/matchbox/sign" + "github.com/coreos/matchbox/matchbox/server" + "github.com/coreos/matchbox/matchbox/sign" ) // Config configures a Server. diff --git a/matchbox/http/test_fixtures.go b/matchbox/http/test_fixtures.go index 792d6231..4de0f323 100644 --- a/matchbox/http/test_fixtures.go +++ b/matchbox/http/test_fixtures.go @@ -1,7 +1,7 @@ package http import ( - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) var ( diff --git a/matchbox/rpc/errors.go b/matchbox/rpc/errors.go index 59813111..7f0d6dea 100644 --- a/matchbox/rpc/errors.go +++ b/matchbox/rpc/errors.go @@ -4,7 +4,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/coreos/coreos-baremetal/matchbox/server" + "github.com/coreos/matchbox/matchbox/server" ) var ( diff --git a/matchbox/rpc/errors_test.go b/matchbox/rpc/errors_test.go index da4796aa..a29cc51e 100644 --- a/matchbox/rpc/errors_test.go +++ b/matchbox/rpc/errors_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/codes" - "github.com/coreos/coreos-baremetal/matchbox/server" + "github.com/coreos/matchbox/matchbox/server" ) func TestGRPCError(t *testing.T) { diff --git a/matchbox/rpc/groups.go b/matchbox/rpc/groups.go index 9e4d8afd..f765e7c5 100644 --- a/matchbox/rpc/groups.go +++ b/matchbox/rpc/groups.go @@ -3,9 +3,9 @@ package rpc import ( "golang.org/x/net/context" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // groupServer takes a matchbox Server and implements a gRPC GroupsServer. diff --git a/matchbox/rpc/grpc.go b/matchbox/rpc/grpc.go index 446ee730..d3248ef2 100644 --- a/matchbox/rpc/grpc.go +++ b/matchbox/rpc/grpc.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" - "github.com/coreos/coreos-baremetal/matchbox/server" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/server" ) // NewServer wraps the matchbox Server to return a new gRPC Server. diff --git a/matchbox/rpc/ignition.go b/matchbox/rpc/ignition.go index 9888fc09..cebbbbcd 100644 --- a/matchbox/rpc/ignition.go +++ b/matchbox/rpc/ignition.go @@ -3,9 +3,9 @@ package rpc import ( "golang.org/x/net/context" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // ignitionServer takes a matchbox Server and implements a gRPC IgnitionServer. diff --git a/matchbox/rpc/profiles.go b/matchbox/rpc/profiles.go index 962c8c0d..9d9e4689 100644 --- a/matchbox/rpc/profiles.go +++ b/matchbox/rpc/profiles.go @@ -3,9 +3,9 @@ package rpc import ( "golang.org/x/net/context" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // profileServer takes a matchbox Server and implements a gRPC ProfilesServer. diff --git a/matchbox/rpc/rpcpb/rpc.pb.go b/matchbox/rpc/rpcpb/rpc.pb.go index 84346bfb..aea1a2e1 100644 --- a/matchbox/rpc/rpcpb/rpc.pb.go +++ b/matchbox/rpc/rpcpb/rpc.pb.go @@ -15,7 +15,7 @@ package rpcpb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import serverpb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" +import serverpb "github.com/coreos/matchbox/matchbox/server/serverpb" import ( context "golang.org/x/net/context" diff --git a/matchbox/rpc/rpcpb/rpc.proto b/matchbox/rpc/rpcpb/rpc.proto index fcaa36fa..053bbce0 100644 --- a/matchbox/rpc/rpcpb/rpc.proto +++ b/matchbox/rpc/rpcpb/rpc.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package rpcpb; -import "github.com/coreos/coreos-baremetal/matchbox/server/serverpb/messages.proto"; +import "github.com/coreos/matchbox/matchbox/server/serverpb/messages.proto"; service Groups { // Create a Group. diff --git a/matchbox/rpc/select.go b/matchbox/rpc/select.go index 4bcfa1be..6378dd17 100644 --- a/matchbox/rpc/select.go +++ b/matchbox/rpc/select.go @@ -3,9 +3,9 @@ package rpc import ( "golang.org/x/net/context" - "github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb" - "github.com/coreos/coreos-baremetal/matchbox/server" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/coreos/matchbox/matchbox/server" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" ) // selectServer wraps a matchbox Server to be suitable for gRPC registration. diff --git a/matchbox/server/server.go b/matchbox/server/server.go index c202d6d3..18807d1f 100644 --- a/matchbox/server/server.go +++ b/matchbox/server/server.go @@ -6,9 +6,9 @@ import ( "context" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" - "github.com/coreos/coreos-baremetal/matchbox/storage" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/storage" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // Possible service errors diff --git a/matchbox/server/server_test.go b/matchbox/server/server_test.go index 469d570f..a374ceb9 100644 --- a/matchbox/server/server_test.go +++ b/matchbox/server/server_test.go @@ -6,10 +6,10 @@ import ( "context" "github.com/stretchr/testify/assert" - pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb" - "github.com/coreos/coreos-baremetal/matchbox/storage" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/coreos/matchbox/matchbox/storage" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestSelectGroup(t *testing.T) { diff --git a/matchbox/server/serverpb/messages.pb.go b/matchbox/server/serverpb/messages.pb.go index 882a2810..d7ed1ac9 100644 --- a/matchbox/server/serverpb/messages.pb.go +++ b/matchbox/server/serverpb/messages.pb.go @@ -33,7 +33,7 @@ package serverpb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import storagepb "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" +import storagepb "github.com/coreos/matchbox/matchbox/storage/storagepb" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/matchbox/server/serverpb/messages.proto b/matchbox/server/serverpb/messages.proto index 88bdd758..f4c8bae7 100644 --- a/matchbox/server/serverpb/messages.proto +++ b/matchbox/server/serverpb/messages.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package serverpb; -import "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb/storage.proto"; +import "github.com/coreos/matchbox/matchbox/storage/storagepb/storage.proto"; message SelectGroupRequest { map labels = 1; diff --git a/matchbox/storage/filestore.go b/matchbox/storage/filestore.go index c61eb1e4..b083c7d2 100644 --- a/matchbox/storage/filestore.go +++ b/matchbox/storage/filestore.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // Config initializes a fileStore. diff --git a/matchbox/storage/filestore_test.go b/matchbox/storage/filestore_test.go index 986d3831..c68aefdb 100644 --- a/matchbox/storage/filestore_test.go +++ b/matchbox/storage/filestore_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" - fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes" + "github.com/coreos/matchbox/matchbox/storage/storagepb" + fake "github.com/coreos/matchbox/matchbox/storage/testfakes" ) func TestGroupPut(t *testing.T) { diff --git a/matchbox/storage/storage.go b/matchbox/storage/storage.go index dcd4f102..bcbf79fa 100644 --- a/matchbox/storage/storage.go +++ b/matchbox/storage/storage.go @@ -3,7 +3,7 @@ package storage import ( "errors" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // Storage errors diff --git a/matchbox/storage/testfakes/broken_store.go b/matchbox/storage/testfakes/broken_store.go index 1ce003d5..8755950f 100644 --- a/matchbox/storage/testfakes/broken_store.go +++ b/matchbox/storage/testfakes/broken_store.go @@ -3,7 +3,7 @@ package testfakes import ( "errors" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) var ( diff --git a/matchbox/storage/testfakes/empty_store.go b/matchbox/storage/testfakes/empty_store.go index a8f52ea8..d5bc0d60 100644 --- a/matchbox/storage/testfakes/empty_store.go +++ b/matchbox/storage/testfakes/empty_store.go @@ -3,7 +3,7 @@ package testfakes import ( "fmt" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // EmptyStore is used for testing purposes. diff --git a/matchbox/storage/testfakes/fixed_store.go b/matchbox/storage/testfakes/fixed_store.go index 5942a6d2..cf289da0 100644 --- a/matchbox/storage/testfakes/fixed_store.go +++ b/matchbox/storage/testfakes/fixed_store.go @@ -3,7 +3,7 @@ package testfakes import ( "fmt" - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) // FixedStore is used for testing purposes. diff --git a/matchbox/storage/testfakes/fixtures.go b/matchbox/storage/testfakes/fixtures.go index 907ca5f9..2290a320 100644 --- a/matchbox/storage/testfakes/fixtures.go +++ b/matchbox/storage/testfakes/fixtures.go @@ -1,7 +1,7 @@ package testfakes import ( - "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb" + "github.com/coreos/matchbox/matchbox/storage/storagepb" ) var ( diff --git a/mkdocs.yml b/mkdocs.yml index 4eb5cc11..d673dd46 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -11,7 +11,7 @@ extra: include_toc: yes show_powered_by: false extra_nav_links: - Github: https://github.com/coreos/coreos-baremetal + Github: https://github.com/coreos/matchbox pages: - Home: 'index.md' - Tutorials: