mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-28 17:11:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/ignition: bump to 2.20.0

Browse Source 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2024-10-24 09:54:47 +02:00
parent c3b1c5869c
commit 17c232f3ae
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
22 changed files with 1381 additions and 747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1848
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch vendored
View File

File diff suppressed because it is too large Load Diff

22
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch vendored
View File

@ -1,34 +1,20 @@
From 344f72895161d411b733a245f5d3e249ef3466fe Mon Sep 17 00:00:00 2001
From 09a77afae8ede189033837888062553ff18e7290 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Mon, 26 Sep 2022 12:12:04 +0200
Subject: [PATCH 02/21] config: add ignition translation
Subject: [PATCH 02/20] config: add ignition translation
it's a merge from flatcar/ign-converter
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
build | 2 +-
config/util/translate.go | 166 +++
config/v24tov31/v24tov31.go | 729 +++++++++++++
config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++
4 files changed, 2588 insertions(+), 1 deletion(-)
3 files changed, 2587 insertions(+)
create mode 100644 config/util/translate.go
create mode 100644 config/v24tov31/v24tov31.go
create mode 100644 config/v24tov31/v24tov31_test.go
diff --git a/build b/build
index 661f0eba..b8f0a049 100755
--- a/build
+++ b/build
@@ -5,7 +5,7 @@ set -eu
export GO111MODULE=on
NAME="ignition"
-ORG_PATH="github.com/coreos"
+ORG_PATH="github.com/flatcar"
REPO_PATH="${ORG_PATH}/${NAME}/v2"
GLDFLAGS=${GLDFLAGS:-}
export GOFLAGS=-mod=vendor
diff --git a/config/util/translate.go b/config/util/translate.go
new file mode 100644
index 00000000..347d148c
@ -2635,5 +2621,5 @@ index 00000000..e81f6bed
+ }
+}
--
2.43.2
2.44.2

18
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch vendored
View File

@ -1,7 +1,7 @@
From a0b0b93a5794d15ac1dcf9cf504bc3b3bafd03ba Mon Sep 17 00:00:00 2001
From b736afa1321345564c6ef6675a980b3187a085b1 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Fri, 7 Jun 2024 09:09:18 +0200
Subject: [PATCH 03/21] mod: add flatcar/ignition@0.36.2
Date: Thu, 24 Oct 2024 10:19:08 +0200
Subject: [PATCH 03/20] mod: add flatcar/ignition@0.36.2
it's required for Ignition conversion.
@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 4 insertions(+)
diff --git a/go.mod b/go.mod
index 42f7800d..5eb792c3 100644
index a22b3edb..11ea000e 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
@ -23,7 +23,7 @@ index 42f7800d..5eb792c3 100644
github.com/google/uuid v1.6.0
github.com/mdlayher/vsock v1.2.1
@@ -32,7 +33,9 @@ require (
cloud.google.com/go/auth v0.4.1 // indirect
cloud.google.com/go/auth v0.6.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/iam v1.1.8 // indirect
+ github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
@ -37,9 +37,9 @@ index 42f7800d..5eb792c3 100644
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
+ go4.org v0.0.0-20160314031811-03efcb870d84 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/text v0.19.0 // indirect
--
2.43.2
2.44.2

58
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch vendored
View File

@ -1,7 +1,7 @@
From 07123c1685d70b571a599eb5869acccf7f95f69f Mon Sep 17 00:00:00 2001
From 3bd24e98f80056f32de366e87b754e3313138e25 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Fri, 7 Jun 2024 09:09:50 +0200
Subject: [PATCH 04/21] sum: go mod tidy
Date: Thu, 24 Oct 2024 10:19:25 +0200
Subject: [PATCH 04/20] sum: go mod tidy
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
@ -9,20 +9,20 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/go.sum b/go.sum
index f92fb462..74444e57 100644
index 556ebeec..d79ae2e0 100644
--- a/go.sum
+++ b/go.sum
@@ -12,6 +12,9 @@ cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO
cloud.google.com/go/storage v1.41.0 h1:RusiwatSu6lHeEXe3kglxakAmAbfV+rhtPqA6i8RBx0=
cloud.google.com/go/storage v1.41.0/go.mod h1:J1WCa/Z2FcgdEDuPUY8DxT5I+d9mFKsCepp5vR6Sq80=
@@ -13,6 +13,9 @@ cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuA
cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s=
+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c=
+github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
github.com/aws/aws-sdk-go v1.53.5 h1:1OcVWMjGlwt7EU5OWmmEEXqaYfmX581EK317QJZXItM=
github.com/aws/aws-sdk-go v1.53.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs=
@@ -23,8 +26,11 @@ github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/
@@ -24,8 +27,11 @@ github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/
github.com/containers/libhvee v0.7.1/go.mod h1:fRKB3AyIqHMvq6xaeYhTpckM2cdoq0oecolyoiuLP7M=
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
@ -34,7 +34,7 @@ index f92fb462..74444e57 100644
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM=
@@ -38,11 +44,15 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
@@ -39,11 +45,15 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@ -50,10 +50,10 @@ index f92fb462..74444e57 100644
github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -80,10 +90,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF
@@ -81,10 +91,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF
github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
github.com/googleapis/gax-go/v2 v2.12.4 h1:9gWcmF85Wvq4ryPFvGFaOgPIs1AQX0d0bcbGw4Z96qg=
github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI=
github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA=
github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@ -64,7 +64,7 @@ index f92fb462..74444e57 100644
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
@@ -92,16 +105,22 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1
@@ -93,16 +106,22 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
@ -87,7 +87,7 @@ index f92fb462..74444e57 100644
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -109,8 +128,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
@@ -110,8 +129,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
@ -98,7 +98,7 @@ index f92fb462..74444e57 100644
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
@@ -124,6 +145,8 @@ go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8p
@@ -125,6 +146,8 @@ go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8p
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
@ -106,33 +106,33 @@ index f92fb462..74444e57 100644
+go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
@@ -136,6 +159,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
@@ -137,6 +160,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
@@ -156,6 +180,7 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
@@ -157,6 +181,7 @@ golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -164,6 +189,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
@@ -165,6 +190,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
@@ -200,8 +226,9 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo=
@@ -200,8 +226,9 @@ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6h
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
@ -143,5 +143,5 @@ index f92fb462..74444e57 100644
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--
2.43.2
2.44.2

16
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch vendored
View File

@ -1,7 +1,7 @@
From 61fedb620afb81ec657419e0835439c03cc14c04 Mon Sep 17 00:00:00 2001
From c051ca72c703700943c79d28b154e460ecb23db1 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Fri, 7 Jun 2024 09:10:35 +0200
Subject: [PATCH 05/21] vendor: go mod vendor
Date: Thu, 24 Oct 2024 10:19:43 +0200
Subject: [PATCH 05/20] vendor: go mod vendor
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
@ -17029,7 +17029,7 @@ index 00000000..1b1efb0f
+ return
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 765c8cb6..d1184cea 100644
index 0d4a188c..8ffe2ea7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -36,6 +36,9 @@ cloud.google.com/go/storage
@ -17039,7 +17039,7 @@ index 765c8cb6..d1184cea 100644
+# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437
+## explicit
+github.com/ajeddeloh/go-json
# github.com/aws/aws-sdk-go v1.53.5
# github.com/aws/aws-sdk-go v1.55.5
## explicit; go 1.19
github.com/aws/aws-sdk-go/aws
@@ -103,6 +106,9 @@ github.com/coreos/go-json
@ -17087,9 +17087,9 @@ index 765c8cb6..d1184cea 100644
+# go4.org v0.0.0-20160314031811-03efcb870d84
+## explicit
+go4.org/errorutil
# golang.org/x/crypto v0.23.0
## explicit; go 1.18
# golang.org/x/crypto v0.28.0
## explicit; go 1.20
golang.org/x/crypto/chacha20
--
2.43.2
2.44.2

28
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch vendored
View File

@ -1,24 +1,24 @@
From 7ad89a545ac31d4308d94c11e5c808e04fd10ce1 Mon Sep 17 00:00:00 2001
From b0c12492819ca9a6b0ef76549458fb99c7c8d93d Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:20:09 +0200
Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x
Date: Thu, 24 Oct 2024 10:20:45 +0200
Subject: [PATCH 06/20] config/v3_6: convert ignition 2.x to 3.x
if the version of ignition is 2.x we convert it to 3.x using
ign-converter.
it should support any 2.x version (or at the least the last 2 releases)
it should support any 2.x version
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
config/v3_5_experimental/config.go | 37 ++++++++++++++++++++++++++++++
config/v3_6_experimental/config.go | 37 ++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/config/v3_5_experimental/config.go b/config/v3_5_experimental/config.go
index f0d4bb84..dccc5c4c 100644
--- a/config/v3_5_experimental/config.go
+++ b/config/v3_5_experimental/config.go
diff --git a/config/v3_6_experimental/config.go b/config/v3_6_experimental/config.go
index 3be26cae..ea367663 100644
--- a/config/v3_6_experimental/config.go
+++ b/config/v3_6_experimental/config.go
@@ -15,9 +15,14 @@
package v3_5_experimental
package v3_6_experimental
import (
+ "encoding/json"
@ -29,9 +29,9 @@ index f0d4bb84..dccc5c4c 100644
"github.com/flatcar/ignition/v2/config/shared/errors"
"github.com/flatcar/ignition/v2/config/util"
+ "github.com/flatcar/ignition/v2/config/v24tov31"
prev "github.com/flatcar/ignition/v2/config/v3_4"
"github.com/flatcar/ignition/v2/config/v3_5_experimental/translate"
"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
prev "github.com/flatcar/ignition/v2/config/v3_5"
"github.com/flatcar/ignition/v2/config/v3_6_experimental/translate"
"github.com/flatcar/ignition/v2/config/v3_6_experimental/types"
@@ -67,6 +72,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) {
return types.Config{}, rpt, err
}
@ -72,5 +72,5 @@ index f0d4bb84..dccc5c4c 100644
return Parse(raw)
}
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch vendored
View File

@ -1,7 +1,7 @@
From 618ac3e4556fc03eae599b736eff2086d9a95722 Mon Sep 17 00:00:00 2001
From 2f5a68dc1c780e1e8647951e1e15c78d569b6ac4 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Mon, 19 Feb 2024 18:12:22 +0100
Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch
Subject: [PATCH 07/20] internal/prv/cmdline: backport flatcar patch
this patch provides backward compatibility for various config
key
@ -12,7 +12,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go
index eb8e2b45..0561438a 100644
index 30203bff..86a5cb79 100644
--- a/internal/providers/cmdline/cmdline.go
+++ b/internal/providers/cmdline/cmdline.go
@@ -33,7 +33,9 @@ import (
@ -36,5 +36,5 @@ index eb8e2b45..0561438a 100644
}
--
2.43.2
2.44.2

10
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch vendored
View File

@ -1,7 +1,7 @@
From 3e06976d9deb99b7979638505541d2166d00f8d9 Mon Sep 17 00:00:00 2001
From 41e66c950879d3b1cddd2a80a48dbd3bf35413f4 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 20 Feb 2024 10:02:28 +0100
Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch
Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch
we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity
@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 63 insertions(+), 55 deletions(-)
diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go
index a150869f..e233865a 100644
index 389ec119..cab9c476 100644
--- a/internal/providers/qemu/qemu_fwcfg.go
+++ b/internal/providers/qemu/qemu_fwcfg.go
@@ -29,6 +29,7 @@ import (
@ -19,7 +19,7 @@ index a150869f..e233865a 100644
"time"
+ iErrors "github.com/flatcar/ignition/v2/config/shared/errors"
"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
"github.com/flatcar/ignition/v2/config/v3_6_experimental/types"
"github.com/flatcar/ignition/v2/internal/distro"
"github.com/flatcar/ignition/v2/internal/platform"
@@ -38,9 +39,11 @@ import (
@ -159,5 +159,5 @@ index a150869f..e233865a 100644
+
}
--
2.43.2
2.44.2

18
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_6-test-add-ignition-2.x-test-cases.patch vendored
View File

@ -1,18 +1,18 @@
From cf6306e8abb2af8294c9c8f4853480fbb01623b6 Mon Sep 17 00:00:00 2001
From 8bc7dd8f47c2dfc083ac92ff4feb2be5180649c1 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
Date: Thu, 2 Sep 2021 11:03:17 +0200
Subject: [PATCH 09/21] config/3_5/test: add ignition 2.x test cases
Subject: [PATCH 09/20] config/3_6/test: add ignition 2.x test cases
Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
---
config/v3_5_experimental/config_test.go | 20 ++++++++++++++++++++
config/v3_6_experimental/config_test.go | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/config/v3_5_experimental/config_test.go b/config/v3_5_experimental/config_test.go
index 7e10866e..58423719 100644
--- a/config/v3_5_experimental/config_test.go
+++ b/config/v3_5_experimental/config_test.go
@@ -157,6 +157,26 @@ func TestParse(t *testing.T) {
diff --git a/config/v3_6_experimental/config_test.go b/config/v3_6_experimental/config_test.go
index 54cbd91c..99f2e3dd 100644
--- a/config/v3_6_experimental/config_test.go
+++ b/config/v3_6_experimental/config_test.go
@@ -165,6 +165,26 @@ func TestParse(t *testing.T) {
in in
out out
}{
@ -40,5 +40,5 @@ index 7e10866e..58423719 100644
in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch vendored
View File

@ -1,7 +1,7 @@
From 5a3d73b56b1cda394534bedfb12b88893c80b60c Mon Sep 17 00:00:00 2001
From c64bfd1cfa7992396609ad55b1e3dba29ce4026c Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 22 Sep 2021 14:53:49 +0200
Subject: [PATCH 10/21] internal/disk/fs: ignore fs format mismatches for the
Subject: [PATCH 10/20] internal/disk/fs: ignore fs format mismatches for the
OEM partition
As soon as the OEM partition's filesystem format changes, all users
@ -22,7 +22,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go
index 62dab634..2bd2debd 100644
index c575ced4..fefd1fff 100644
--- a/internal/exec/stages/disks/filesystems.go
+++ b/internal/exec/stages/disks/filesystems.go
@@ -126,7 +126,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error {
@ -35,5 +35,5 @@ index 62dab634..2bd2debd 100644
(fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) {
s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device)
--
2.43.2
2.44.2

10
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch vendored
View File

@ -1,7 +1,7 @@
From c805eca7a8627020e0c73c304aba339502edd71c Mon Sep 17 00:00:00 2001
From 0bcc2592c3809a86c7649cd667bd481e5526af2e Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 20 Feb 2024 10:12:02 +0100
Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url
Subject: [PATCH 11/20] VMware: Fix guestinfo.*.config.data and *.config.url
variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -26,7 +26,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 71 insertions(+), 22 deletions(-)
diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go
index 1d40249c..a0833794 100644
index 597c33fd..3680a4cd 100644
--- a/internal/providers/vmware/vmware_amd64.go
+++ b/internal/providers/vmware/vmware_amd64.go
@@ -19,6 +19,7 @@ package vmware
@ -35,7 +35,7 @@ index 1d40249c..a0833794 100644
"fmt"
+ "net/url"
"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
"github.com/flatcar/ignition/v2/config/v3_6_experimental/types"
"github.com/flatcar/ignition/v2/internal/platform"
@@ -58,26 +59,83 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
return types.Config{}, report.Report{}, platform.ErrNoProvider
@ -164,5 +164,5 @@ index 1d40249c..a0833794 100644
func delConfig(f *resource.Fetcher) error {
--
2.43.2
2.44.2

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch vendored
View File

@ -1,7 +1,7 @@
From 9807190a06785b5db97247fc5c5e4923aff8cd00 Mon Sep 17 00:00:00 2001
From 6f4ae547913ed6be8801ec17fd91f3ce0769d34e Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 2 Feb 2022 13:27:18 +0100
Subject: [PATCH 12/21] config/version: handle configuration version 1
Subject: [PATCH 12/20] config/version: handle configuration version 1
version 2 should be able to translate configuration version 1 but the `GetConfigVersion`
was not able to detect version 1 configuration since for this particular
@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644
return semver.Version{}, report.Report{}, errors.ErrInvalidVersion
}
--
2.43.2
2.44.2

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch vendored
View File

@ -1,7 +1,7 @@
From 638828473be2eda1277ec1e1891b951c771de6de Mon Sep 17 00:00:00 2001
From 94514a6ea6842dc32ab5ec82c63455797a946949 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 22 Feb 2022 15:41:13 +0100
Subject: [PATCH 13/21] config/util: add cloud init detection to initial
Subject: [PATCH 13/20] config/util: add cloud init detection to initial
parsing
we detect if the config is not an ignition one (script/cloudinit) and we
@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644
if err == nil {
return report.Report{}, nil
--
2.43.2
2.44.2

16
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch vendored
View File

@ -1,7 +1,7 @@
From 21f26593b93415a632449d05e787237d29c79ba3 Mon Sep 17 00:00:00 2001
From 35bd1887b3d2837efbcee3de52e567c7d76e6669 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:38:16 +0200
Subject: [PATCH 14/21] Revert "*: drop OEM URI support"
Subject: [PATCH 14/20] Revert "*: drop OEM URI support"
This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3.
---
@ -81,10 +81,10 @@ index 9b2b4405..5258c3c6 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
index 8dc0feb1..e7dd1dd4 100644
index eef319b2..21ad376e 100644
--- a/docs/supported-platforms.md
+++ b/docs/supported-platforms.md
@@ -12,6 +12,7 @@ Ignition is currently only supported for the following platforms:
@@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms:
* [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
* [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
* [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
@ -93,7 +93,7 @@ index 8dc0feb1..e7dd1dd4 100644
* [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately.
* [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately.
diff --git a/internal/distro/distro.go b/internal/distro/distro.go
index 35c65721..3886ab56 100644
index eb4c3179..2726d705 100644
--- a/internal/distro/distro.go
+++ b/internal/distro/distro.go
@@ -23,13 +23,17 @@ import (
@ -115,7 +115,7 @@ index 35c65721..3886ab56 100644
// Helper programs
groupaddCmd = "groupadd"
@@ -82,11 +86,14 @@ var (
@@ -83,11 +87,14 @@ var (
luksCexSecureKeyRepo = "/etc/zkey/repository/"
)
@ -132,7 +132,7 @@ index 35c65721..3886ab56 100644
func GroupaddCmd() string { return groupaddCmd }
func GroupdelCmd() string { return groupdelCmd }
diff --git a/internal/resource/url.go b/internal/resource/url.go
index 8ccf9399..7b13c242 100644
index 4f55dc2b..469857d0 100644
--- a/internal/resource/url.go
+++ b/internal/resource/url.go
@@ -23,10 +23,12 @@ import (
@ -271,5 +271,5 @@ index 8ccf9399..7b13c242 100644
+ )
+}
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch vendored
View File

@ -1,7 +1,7 @@
From 7d1b3ded6d9f252cef23198c9e309d3120a2aee0 Mon Sep 17 00:00:00 2001
From de8ca35ae723b43509cddc5e48fc0b0c67464b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailuke@microsoft.com>
Date: Wed, 7 Jul 2021 18:40:52 +0200
Subject: [PATCH 15/21] internal/resource/url: support btrfs as OEM partition
Subject: [PATCH 15/20] internal/resource/url: support btrfs as OEM partition
filesystem
When btrfs is used to fit more content into the partition, mounting
@ -12,7 +12,7 @@ When mounting ext4 fails, try mounting as btrfs.
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/internal/resource/url.go b/internal/resource/url.go
index 7b13c242..6b9f20c6 100644
index 469857d0..0457c15f 100644
--- a/internal/resource/url.go
+++ b/internal/resource/url.go
@@ -726,8 +726,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error {
@ -35,5 +35,5 @@ index 7b13c242..6b9f20c6 100644
return nil
--
2.43.2
2.44.2

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch vendored
View File

@ -1,7 +1,7 @@
From 0e91455c9075e7605e72f5ca4a932ca94ee24635 Mon Sep 17 00:00:00 2001
From 3f816cd80b0f312ce42f475ef3944cf0ba54bd5b Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Thu, 10 Nov 2022 11:58:49 +0100
Subject: [PATCH 16/21] translation: support OEM and oem
Subject: [PATCH 16/20] translation: support OEM and oem
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644
+ }
+}
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch vendored
View File

@ -1,7 +1,7 @@
From 20943aff39cc77fd27b61e17e0799d4d1c9c6b6e Mon Sep 17 00:00:00 2001
From 79df02821be2a0d942662ccadfe2233cde41955f Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 20 Feb 2024 10:25:24 +0100
Subject: [PATCH 17/21] revert: internal/oem: drop noop OEMs
Subject: [PATCH 17/20] revert: internal/oem: drop noop OEMs
This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132
@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 16 insertions(+)
diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go
index 8a5c2362..9b764e09 100644
index 27c923d4..ae259f8f 100644
--- a/internal/providers/metal/metal.go
+++ b/internal/providers/metal/metal.go
@@ -26,10 +26,26 @@ import (
@ -42,5 +42,5 @@ index 8a5c2362..9b764e09 100644
func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
--
2.43.2
2.44.2

12
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch vendored
View File

@ -1,7 +1,7 @@
From 5a7e0b9d6334983c95cb2457b75ea87bdd9f9837 Mon Sep 17 00:00:00 2001
From eb5bb6977caec2b38f77f63fa772720d4f2fc11e Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Mon, 4 Mar 2024 15:05:14 +0100
Subject: [PATCH 18/21] docs: Add re-added platforms to docs to pass tests
Subject: [PATCH 18/20] docs: Add re-added platforms to docs to pass tests
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Co-Authored-By: Krzesimir Nowak <knowak@microsoft.com
@ -10,10 +10,10 @@ Co-Authored-By: Krzesimir Nowak <knowak@microsoft.com
1 file changed, 4 insertions(+)
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
index e7dd1dd4..83af90e3 100644
index 21ad376e..232482e6 100644
--- a/docs/supported-platforms.md
+++ b/docs/supported-platforms.md
@@ -15,6 +15,7 @@ Ignition is currently only supported for the following platforms:
@@ -15,6 +15,7 @@ Ignition is currently supported for the following platforms:
* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`.
* [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
* [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately.
@ -21,7 +21,7 @@ index e7dd1dd4..83af90e3 100644
* [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately.
* [Exoscale] (`exoscale`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
* [Google Cloud] (`gcp`) - Ignition will read its configuration from the instance metadata entry named "user-data". Cloud SSH keys are handled separately.
@@ -28,6 +29,9 @@ Ignition is currently only supported for the following platforms:
@@ -29,6 +30,9 @@ Ignition is currently supported for the following platforms:
* [Equinix Metal] (`packet`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
* [IBM Power Systems Virtual Server] (`powervs`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
* [QEMU] (`qemu`) - Ignition will read its configuration from the 'opt/com.coreos/config' key on the QEMU Firmware Configuration Device (available in QEMU 2.4.0 and higher).
@ -32,5 +32,5 @@ index e7dd1dd4..83af90e3 100644
* [VirtualBox] (`virtualbox`) - Use the VirtualBox guest property `/Ignition/Config` to provide the config to the virtual machine.
* [VMware] (`vmware`) - Use the VMware Guestinfo variables `ignition.config.data` and `ignition.config.data.encoding` to provide the config and its encoding to the virtual machine. Valid encodings are "", "base64", and "gzip+base64". Guestinfo variables can be provided directly or via an OVF environment, with priority given to variables specified directly.
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch vendored
View File

@ -1,7 +1,7 @@
From 7a40967779d03da8604ae13890db5b06230b9bc9 Mon Sep 17 00:00:00 2001
From 44228a0c384748f7488d0fc84b0a2193d5fe1b82 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 4 Apr 2023 12:12:42 +0200
Subject: [PATCH 19/21] /usr/share/oem -> /oem
Subject: [PATCH 19/20] /usr/share/oem -> /oem
---
config/util/translate.go | 2 +-
@ -22,7 +22,7 @@ index 347d148c..d4c057b2 100644
// generate a new path
fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
diff --git a/internal/distro/distro.go b/internal/distro/distro.go
index 3886ab56..79fa8712 100644
index 2726d705..c335eeee 100644
--- a/internal/distro/distro.go
+++ b/internal/distro/distro.go
@@ -32,7 +32,10 @@ var (
@ -38,5 +38,5 @@ index 3886ab56..79fa8712 100644
// Helper programs
--
2.43.2
2.44.2

8
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch vendored
View File

@ -1,7 +1,7 @@
From 35cf5f09178b1ab2dfbc7ab04bd9339c5826c21e Mon Sep 17 00:00:00 2001
From c62391465f02cbb053e0bb24b8201dc6c89a9cdf Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 16 May 2023 17:43:43 +0200
Subject: [PATCH 20/21] internal/exec/stages/mount: Mount /oem
Subject: [PATCH 20/20] internal/exec/stages/mount: Mount /oem
When asking to mount the OEM partition to /usr/share/oem, actually
mount it in /oem. The /usr/share/oem is a symlink pointing to /oem, so
@ -12,7 +12,7 @@ into /usr/share/oem, should end up having things in /oem.
1 file changed, 5 insertions(+)
diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go
index ecf7ce7f..395e772a 100644
index bace4bbd..bc6767d2 100644
--- a/internal/exec/stages/mount/mount.go
+++ b/internal/exec/stages/mount/mount.go
@@ -118,6 +118,11 @@ func (s stage) mountFs(fs types.Filesystem) error {
@ -28,5 +28,5 @@ index ecf7ce7f..395e772a 100644
if err := checkForNonDirectories(path); err != nil {
return err
--
2.43.2
2.44.2

0
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.19.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.20.0.ebuild vendored
View File

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ inherit coreos-go git-r3 systemd udev
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64"
else
EGIT_COMMIT="09c99e0305adc1377b87964a39ad2d009aec9b12" # v2.19.0
EGIT_COMMIT="a204f429f13194ae379be9401d49e5241439660b" # v2.20.0
KEYWORDS="amd64 arm64"
fi
@ -45,10 +45,10 @@ PATCHES=(
"${FILESDIR}/0003-mod-add-flatcar-ignition-0.36.2.patch"
"${FILESDIR}/0004-sum-go-mod-tidy.patch"
"${FILESDIR}/0005-vendor-go-mod-vendor.patch"
"${FILESDIR}/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch"
"${FILESDIR}/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch"
"${FILESDIR}/0007-internal-prv-cmdline-backport-flatcar-patch.patch"
"${FILESDIR}/0008-provider-qemu-apply-fw_cfg-patch.patch"
"${FILESDIR}/0009-config-3_5-test-add-ignition-2.x-test-cases.patch"
"${FILESDIR}/0009-config-3_6-test-add-ignition-2.x-test-cases.patch"
"${FILESDIR}/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch"
"${FILESDIR}/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch"
"${FILESDIR}/0012-config-version-handle-configuration-version-1.patch"