Skip to content
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

*: sed s/flatcar-linux/flatcar #21

Merged
merged 1 commit into from
Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff 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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
```
Expand All @@ -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)
2 changes: 1 addition & 1 deletion config/astyaml/astyaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
14 changes: 7 additions & 7 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion config/templating/templating.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
16 changes: 8 additions & 8 deletions config/types/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions config/types/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions config/types/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions config/types/disks.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions config/types/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions config/types/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions config/types/filesystems.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/flannel.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion config/types/locksmith.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"time"

"github.com/flatcar-linux/ignition/config/validate/report"
"github.com/flatcar/ignition/config/validate/report"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/types/locksmith_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions config/types/networkd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/passwd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/raid.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/security.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions config/types/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions config/types/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion config/types/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion doc/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion doc/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions doc/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
Loading