Merge pull request #21 from flatcar/tormath1/flatcar

*: sed s/flatcar-linux/flatcar
flatcar · Sep 14, 2022 · 8ec301f · 8ec301f
2 parents 3d9d636 + c3f02f7
commit 8ec301f
Show file tree

Hide file tree

Showing 63 changed files with 152 additions and 149 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,7 +5,7 @@ on:
     - v*
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: flatcar-linux/ct
+  IMAGE_NAME: flatcar/ct
 
 jobs:
   docker:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:alpine
 ENV CGO_ENABLED=0
-WORKDIR $GOPATH/src/github.com/flatcar-linux/container-linux-config-transpiler
+WORKDIR $GOPATH/src/github.com/flatcar/container-linux-config-transpiler
 COPY . .
 RUN apk update && apk add --virtual .build-deps bash git make \
     && make \

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ else
 endif
 
 VERSION=$(shell git describe --dirty)
-REPO=github.com/flatcar-linux/container-linux-config-transpiler
+REPO=github.com/flatcar/container-linux-config-transpiler
 LD_FLAGS="-w -X $(REPO)/internal/version.Raw=$(VERSION)"
 
 GO_SOURCES=$(shell find . -name "*.go")

diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ For a more in-depth view of ct and why it exists, take a look at the [Overview][
 
 Please use the [bug tracker][issues] to report bugs.
 
-[ignition]: https://github.com/flatcar-linux/ignition
-[issues]: https://github.com/flatcar-linux/flatcar/issues
+[ignition]: https://github.com/flatcar/ignition
+[issues]: https://github.com/flatcar/flatcar/issues
 [overview]: doc/overview.md
 [get-started]: doc/getting-started.md
 [config]: doc/configuration.md
@@ -54,7 +54,7 @@ ARCH=x86_64
 OS=unknown-linux-gnu # Linux
 
 # Specify download URL
-DOWNLOAD_URL=https://github.com/flatcar-linux/container-linux-config-transpiler/releases/download
+DOWNLOAD_URL=https://github.com/flatcar/container-linux-config-transpiler/releases/download
 
 # Remove previous downloads
 rm -f /tmp/ct-${CT_VER}-${ARCH}-${OS} /tmp/ct-${CT_VER}-${ARCH}-${OS}.asc /tmp/coreos-app-signing-pubkey.gpg
@@ -72,14 +72,14 @@ curl -L ${DOWNLOAD_URL}/${CT_VER}/ct-${CT_VER}-${ARCH}-${OS}.asc -o /tmp/ct-${CT
 gpg2 --verify /tmp/ct-${CT_VER}-${ARCH}-${OS}.asc /tmp/ct-${CT_VER}-${ARCH}-${OS}
 ```
 
-[releases]: https://github.com/flatcar-linux/container-linux-config-transpiler/releases
+[releases]: https://github.com/flatcar/container-linux-config-transpiler/releases
 
 ### Building from source
 
 To build from source you'll need to have the go compiler installed on your system.
 
 ```shell
-git clone --branch v0.8.0 https://github.com/flatcar-linux/container-linux-config-transpiler
+git clone --branch v0.8.0 https://github.com/flatcar/container-linux-config-transpiler
 cd container-linux-config-transpiler
 make
 ```
@@ -90,6 +90,6 @@ Note: Review releases for new branch versions.
 
 ## Related projects
 
-- [https://github.com/flatcar-linux/ignition](https://github.com/flatcar-linux/ignition)
-- [https://github.com/flatcar-linux/afterburn/](https://github.com/flatcar-linux/afterburn)
+- [https://github.com/flatcar/ignition](https://github.com/flatcar/ignition)
+- [https://github.com/flatcar/afterburn/](https://github.com/flatcar/afterburn)
 - [https://github.com/poseidon/matchbox](https://github.com/poseidon/matchbox)
diff --git a/config/astyaml/astyaml.go b/config/astyaml/astyaml.go
@@ -19,7 +19,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/astnode"
 	yaml "gopkg.in/yaml.v3"
 )
 

diff --git a/config/config.go b/config/config.go
@@ -17,15 +17,15 @@ package config
 import (
 	"reflect"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 	yaml "gopkg.in/yaml.v3"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/platform"
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/types"
+	"github.com/flatcar/container-linux-config-transpiler/config/astyaml"
+	"github.com/flatcar/container-linux-config-transpiler/config/platform"
+	"github.com/flatcar/container-linux-config-transpiler/config/types"
 )
 
 // Parse will convert a byte slice containing a Container Linux Config into a

diff --git a/config/config_test.go b/config/config_test.go
@@ -22,11 +22,11 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coreos/go-semver/semver"
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/report"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/types"
-	"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
+	"github.com/flatcar/container-linux-config-transpiler/config/types"
+	"github.com/flatcar/container-linux-config-transpiler/internal/util"
 )
 
 func TestParse(t *testing.T) {

diff --git a/config/templating/templating.go b/config/templating/templating.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/platform"
+	"github.com/flatcar/container-linux-config-transpiler/config/platform"
 )
 
 var (

diff --git a/config/types/common.go b/config/types/common.go
@@ -19,14 +19,14 @@ import (
 	"fmt"
 	"reflect"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
-
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/platform"
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/templating"
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/types/util"
-	iutil "github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
+
+	"github.com/flatcar/container-linux-config-transpiler/config/platform"
+	"github.com/flatcar/container-linux-config-transpiler/config/templating"
+	"github.com/flatcar/container-linux-config-transpiler/config/types/util"
+	iutil "github.com/flatcar/container-linux-config-transpiler/internal/util"
 )
 
 var (

diff --git a/config/types/config.go b/config/types/config.go
@@ -18,9 +18,9 @@ import (
 	"errors"
 	"net/url"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 var (

diff --git a/config/types/converter.go b/config/types/converter.go
@@ -17,12 +17,12 @@ package types
 import (
 	"reflect"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
+	"github.com/flatcar/container-linux-config-transpiler/config/astyaml"
 )
 
 type converter func(in Config, ast astnode.AstNode, out ignTypes.Config, platform string) (ignTypes.Config, report.Report, astnode.AstNode)

diff --git a/config/types/disks.go b/config/types/disks.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 
 	"github.com/alecthomas/units"
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 const (

diff --git a/config/types/docker.go b/config/types/docker.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"strings"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Docker struct {

diff --git a/config/types/etcd.go b/config/types/etcd.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 
 	"github.com/coreos/go-semver/semver"
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 var (

diff --git a/config/types/files.go b/config/types/files.go
@@ -22,12 +22,12 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
-	"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
+	"github.com/flatcar/container-linux-config-transpiler/config/astyaml"
+	"github.com/flatcar/container-linux-config-transpiler/internal/util"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 	"github.com/vincent-petithory/dataurl"
 )
 

diff --git a/config/types/filesystems.go b/config/types/filesystems.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Filesystem struct {

diff --git a/config/types/flannel.go b/config/types/flannel.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 
 	"github.com/coreos/go-semver/semver"
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 var (

diff --git a/config/types/locksmith.go b/config/types/locksmith.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 var (

diff --git a/config/types/locksmith_test.go b/config/types/locksmith_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 func TestValidateWindowStart(t *testing.T) {

diff --git a/config/types/networkd.go b/config/types/networkd.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Networkd struct {

diff --git a/config/types/passwd.go b/config/types/passwd.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Passwd struct {

diff --git a/config/types/raid.go b/config/types/raid.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Raid struct {

diff --git a/config/types/security.go b/config/types/security.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Security struct {

diff --git a/config/types/systemd.go b/config/types/systemd.go
@@ -15,9 +15,9 @@
 package types
 
 import (
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 type Systemd struct {

diff --git a/config/types/update.go b/config/types/update.go
@@ -20,11 +20,11 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
+	"github.com/flatcar/container-linux-config-transpiler/internal/util"
 
-	ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
-	"github.com/flatcar-linux/ignition/config/validate/astnode"
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	ignTypes "github.com/flatcar/ignition/config/v2_3/types"
+	"github.com/flatcar/ignition/config/validate/astnode"
+	"github.com/flatcar/ignition/config/validate/report"
 	"github.com/vincent-petithory/dataurl"
 )
 

diff --git a/config/types/update_test.go b/config/types/update_test.go
@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/flatcar-linux/ignition/config/validate/report"
+	"github.com/flatcar/ignition/config/validate/report"
 )
 
 func TestValidateUpdateGroup(t *testing.T) {

diff --git a/doc/configuration.md b/doc/configuration.md
@@ -176,4 +176,4 @@ _Note: all fields are optional unless otherwise marked_
 
 [part-types]: http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs
 [rfc2397]: https://tools.ietf.org/html/rfc2397
-[ignition-fs-reuse]: https://github.com/flatcar-linux/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics
+[ignition-fs-reuse]: https://github.com/flatcar/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics
diff --git a/doc/getting-started.md b/doc/getting-started.md
@@ -34,4 +34,4 @@ To see some examples for what else ct can do, head over to the [examples][3].
 [1]: configuration.md
 [2]: https://coreos.com/ignition/docs/latest/supported-platforms.html
 [3]: examples.md
-[4]: https://github.com/flatcar-linux/container-linux-config-transpiler/releases
+[4]: https://github.com/flatcar/container-linux-config-transpiler/releases
diff --git a/doc/overview.md b/doc/overview.md
@@ -6,8 +6,8 @@ The Container Linux Config is intended to be human-friendly, and is thus in YAML
 
 The resulting Ignition config is very much not intended to be human-friendly. It is an artifact produced by ct that users should simply pass along to their machines. JSON was chosen over a binary format to make the process more transparent and to allow power users to inspect/modify what ct produces, but it would have worked fine if the result from ct had not been human readable at all.
 
-[ct]: https://github.com/flatcar-linux/container-linux-config-transpiler/
-[ignition]: https://github.com/flatcar-linux/ignition
+[ct]: https://github.com/flatcar/container-linux-config-transpiler/
+[ignition]: https://github.com/flatcar/ignition
 
 ## Why a two-step process?
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         - v*
     env:
       REGISTRY: ghcr.io
-      IMAGE_NAME: flatcar-linux/ct
+      IMAGE_NAME: flatcar/ct
     jobs:
       docker:
@@ Expand Down @@