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

mod: use flatcar/cloudinit instead of coreos/cloudinit #502

Merged
merged 4 commits into from
Feb 23, 2024
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
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/aws/aws-sdk-go v1.44.46
github.com/brightbox/gobrightbox/v2 v2.2.0
github.com/coreos/butane v0.14.1-0.20220401164106-6b5239299226
github.com/coreos/coreos-cloudinit v1.11.0
github.com/coreos/go-iptables v0.5.0
github.com/coreos/go-omaha v0.0.0-20170526203809-f8acb2d7b76c
github.com/coreos/go-semver v0.3.0
Expand All @@ -20,6 +19,7 @@ require (
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
github.com/digitalocean/godo v1.45.0
github.com/flatcar/container-linux-config-transpiler v0.9.4
github.com/flatcar/coreos-cloudinit v1.14.1-0.20240223132627-a7bc5f0050ab
github.com/flatcar/ignition v0.36.2
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384
github.com/golang/protobuf v1.5.3
Expand Down Expand Up @@ -72,7 +72,6 @@ require (
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/vcontext v0.0.0-20220326205524-7fcaf69e7050 // indirect
github.com/coreos/yaml v0.0.0-20141224210557-6b16a5714269 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
Expand Down
8 changes: 3 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/butane v0.14.1-0.20220401164106-6b5239299226 h1:bFC7LN8ltkYe5xPHj/fQ4qRGbKlYy0VXimkbp7ZNjP8=
github.com/coreos/butane v0.14.1-0.20220401164106-6b5239299226/go.mod h1:Q5DcBsHDckEZ7IgQSb1MvvkNc50dpoT1lOHdGWwCRjY=
github.com/coreos/coreos-cloudinit v1.11.0 h1:qSLLJPaK4zavsL3ii02F2+v3P9I7JcaOW73s5+UKfw8=
github.com/coreos/coreos-cloudinit v1.11.0/go.mod h1:hV3swhSwq+bRX5apuk57gG+3fsQacgbrZVxjPTqo0zo=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-iptables v0.5.0 h1:mw6SAibtHKZcNzAsOxjoHIG0gy5YFHhypWSSNc6EjbQ=
github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
Expand Down Expand Up @@ -162,8 +160,6 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4/go.mod h1:HckqHnP/HI41vS0bfVjJ20u6jD0biI5+68QwZm5Xb9U=
github.com/coreos/vcontext v0.0.0-20220326205524-7fcaf69e7050 h1:Je4Sor/M7mqtqardljqFVNzDtOd2GQtUDFMXu8HKQb4=
github.com/coreos/vcontext v0.0.0-20220326205524-7fcaf69e7050/go.mod h1:HckqHnP/HI41vS0bfVjJ20u6jD0biI5+68QwZm5Xb9U=
github.com/coreos/yaml v0.0.0-20141224210557-6b16a5714269 h1:/1sjrpK5Mb6IwyFOKd+u7321tXfNAsj0Ci8CivZmSlo=
github.com/coreos/yaml v0.0.0-20141224210557-6b16a5714269/go.mod h1:Bl1D/T9QJhVdu6eFoLrGxN90+admDLGaLz2HXH/VzDc=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down Expand Up @@ -193,6 +189,8 @@ github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBF
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/flatcar/container-linux-config-transpiler v0.9.4 h1:yXQ0NB8PeNrKJPrZvbv5/DV63PNhTqt8vaf8YxmX/RA=
github.com/flatcar/container-linux-config-transpiler v0.9.4/go.mod h1:LxanhPvXkWgHG9PrkT4rX/p7YhUPdDGGsUdkNpV3L5U=
github.com/flatcar/coreos-cloudinit v1.14.1-0.20240223132627-a7bc5f0050ab h1:8BYhpBBBGjRm+Eypp7zT70cwD5wIIAc90TZgv8SqCHg=
github.com/flatcar/coreos-cloudinit v1.14.1-0.20240223132627-a7bc5f0050ab/go.mod h1:Hn0QnsJ4aioyMzjzGXapN5Lh3kOGrdCfYSdYl3KwArk=
github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4=
github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA=
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
Expand Down Expand Up @@ -907,8 +905,8 @@ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
Expand Down
2 changes: 1 addition & 1 deletion platform/conf/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (

butane "github.com/coreos/butane/config"
"github.com/coreos/butane/config/common"
cci "github.com/coreos/coreos-cloudinit/config"
ign3err "github.com/coreos/ignition/v2/config/shared/errors"
v3 "github.com/coreos/ignition/v2/config/v3_0"
v3types "github.com/coreos/ignition/v2/config/v3_0/types"
Expand All @@ -42,6 +41,7 @@ import (
ign3validate "github.com/coreos/ignition/v2/config/validate"
"github.com/coreos/pkg/capnslog"
ct "github.com/flatcar/container-linux-config-transpiler/config"
cci "github.com/flatcar/coreos-cloudinit/config"
ignerr "github.com/flatcar/ignition/config/shared/errors"
v1 "github.com/flatcar/ignition/config/v1"
v1types "github.com/flatcar/ignition/config/v1/types"
Expand Down
188 changes: 0 additions & 188 deletions vendor/github.com/coreos/yaml/LICENSE

This file was deleted.

31 changes: 0 additions & 31 deletions vendor/github.com/coreos/yaml/LICENSE.libyaml

This file was deleted.

Loading