Skip to content

Commit

Permalink
Merge pull request #7 from kinvolk/invidian/dependencies
Browse files Browse the repository at this point in the history
Update dependencies, rename module again and fix some links
  • Loading branch information
invidian authored Jun 20, 2021
2 parents 7abced2 + 80c1a15 commit 727e3e9
Show file tree
Hide file tree
Showing 58 changed files with 12,854 additions and 485 deletions.
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/kinvolk/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/kinvolk/container-linux-config-transpiler
LD_FLAGS="-w -X $(REPO)/internal/version.Raw=$(VERSION)"

GO_SOURCES=$(shell find . -name "*.go")
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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/coreos/ignition
[issues]: https://issues.coreos.com
[issues]: https://github.com/kinvolk/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/kinvolk/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/kinvolk/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/kinvolk/container-linux-config-transpiler
cd container-linux-config-transpiler
make
```
Expand All @@ -91,5 +91,5 @@ Note: Review releases for new branch versions.
## Related projects

- [https://github.com/coreos/ignition](https://github.com/coreos/ignition)
- [https://github.com/coreos/coreos-metadata/](https://github.com/coreos/coreos-metadata/)
- [https://github.com/coreos/matchbox](https://github.com/coreos/matchbox)
- [https://github.com/kinvolk/afterburn/](https://github.com/kinvolk/afterburn)
- [https://github.com/poseidon/matchbox](https://github.com/poseidon/matchbox)
6 changes: 3 additions & 3 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"

"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/kinvolk/container-linux-config-transpiler/config/astyaml"
"github.com/kinvolk/container-linux-config-transpiler/config/platform"
"github.com/kinvolk/container-linux-config-transpiler/config/types"
)

// Parse will convert a byte slice containing a Container Linux Config into a
Expand Down
4 changes: 2 additions & 2 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/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/kinvolk/container-linux-config-transpiler/config/types"
"github.com/kinvolk/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/kinvolk/container-linux-config-transpiler/config/platform"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions config/types/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/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"
"github.com/kinvolk/container-linux-config-transpiler/config/platform"
"github.com/kinvolk/container-linux-config-transpiler/config/templating"
"github.com/kinvolk/container-linux-config-transpiler/config/types/util"
iutil "github.com/kinvolk/container-linux-config-transpiler/internal/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/types/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"

"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
"github.com/kinvolk/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
4 changes: 2 additions & 2 deletions config/types/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ 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/kinvolk/container-linux-config-transpiler/config/astyaml"
"github.com/kinvolk/container-linux-config-transpiler/internal/util"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
Expand Down
2 changes: 1 addition & 1 deletion config/types/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/url"
"strings"

"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
"github.com/kinvolk/container-linux-config-transpiler/internal/util"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
Expand Down
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/kinvolk/container-linux-config-transpiler/releases
2 changes: 1 addition & 1 deletion doc/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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/
[ct]: https://github.com/kinvolk/container-linux-config-transpiler/
[ignition]: https://github.com/coreos/ignition

## Why a two-step process?
Expand Down
22 changes: 9 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
module github.com/flatcar-linux/container-linux-config-transpiler
module github.com/kinvolk/container-linux-config-transpiler

go 1.15
go 1.16

require (
github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 // indirect
github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd
github.com/alecthomas/units v0.0.0-20150109002421-6b4e7dc5e314
github.com/coreos/go-semver v0.2.1-0.20170209201757-5e3acbb5668c
github.com/coreos/go-systemd v0.0.0-20180202092358-40e2722dffea // indirect
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/ignition v0.35.0
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.1.4
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb
go4.org v0.0.0-20160314031811-03efcb870d84 // indirect
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
github.com/stretchr/testify v1.4.0
github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
)
Loading

0 comments on commit 727e3e9

Please sign in to comment.