mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2187 from flatcar/tormath1/ign-converter

Browse Source 
sys-apps/ignition: rework ignition patches
This commit is contained in:
Mathieu Tortuyaux 2022-09-27 11:58:29 +02:00 committed by GitHub
commit acdc6ca870
22 changed files with 3245 additions and 1803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2022-09-27-ignition.md vendored Normal file
View File

@ -0,0 +1 @@
- Added merging of Ignition systemd duplicated units when auto-translating from Ignition 2 to Ignition 3. ([coreos-overlay#2187](https://github.com/flatcar/coreos-overlay/pull/2187))

600
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch → 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

27
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch vendored Normal file
View File

@ -0,0 +1,27 @@
From 6b8f73219e65925c4c1674d05b371584b6d29d2a Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Mon, 26 Sep 2022 12:09:03 +0200
Subject: [PATCH 02/16] mod: add flatcar/ignition@0.36.2
it's required for Ignition conversion.
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
go.mod | 1 +
1 file changed, 1 insertion(+)
diff --git a/go.mod b/go.mod
index 7c813620..1a85cbc7 100644
--- a/go.mod
+++ b/go.mod
@@ -10,6 +10,7 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd/v22 v22.0.0
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
+ github.com/flatcar/ignition v0.36.2
github.com/google/renameio v0.1.0
github.com/google/uuid v1.1.1
github.com/pin/tftp v2.1.0+incompatible
--
2.35.1

36
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch vendored
View File

@ -1,36 +0,0 @@
From c3e6b575bdb267c3500e95934f83247ccc7792dc Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:10:45 +0200
Subject: [PATCH 02/15] mod: add ign-converter dependency
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
go.mod | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/go.mod b/go.mod
index e5a47737..9b5da9f3 100644
--- a/go.mod
+++ b/go.mod
@@ -10,6 +10,8 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd/v22 v22.0.0
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
+ github.com/flatcar/ign-converter v0.2.0
+ github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
github.com/google/renameio v0.1.0
github.com/google/uuid v1.1.1
github.com/pin/tftp v2.1.0+incompatible
@@ -21,7 +23,9 @@ require (
golang.org/x/net v0.0.0-20200602114024-627f9648deb9
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20200610111108-226ff32320da
+ golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.0.0-20200610160956-3e83d1e96d0e // indirect
google.golang.org/api v0.26.0
google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
)
--
2.35.1

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

@ -1,34 +1,28 @@
From ebbe212122592250ae7a5d0d8a74b2e78f1cb787 Mon Sep 17 00:00:00 2001
From a83660f437ffe0fe277f863d26ce39d41e3144c9 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:11:59 +0200
Subject: [PATCH 03/15] sum: go mod tidy
Date: Mon, 26 Sep 2022 12:09:29 +0200
Subject: [PATCH 03/16] sum: go mod tidy
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
go.sum | 40 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
go.sum | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/go.sum b/go.sum
index 097b98c7..afe8e529 100644
index 097b98c7..1d541aaf 100644
--- a/go.sum
+++ b/go.sum
@@ -38,6 +38,10 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
@@ -38,6 +38,9 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+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/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559 h1:4SPQljF/GJ8Q+QlCWMWxRBepub4DresnOm4eI2ebFGc=
+github.com/ajeddeloh/go-json v0.0.0-20200220154158-5ae607161559/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.30.28 h1:SaPM7dlmp7h3Lj1nJ4jdzOkTdom08+g20k7AU5heZYg=
github.com/aws/aws-sdk-go v1.30.28/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c h1:uYq6BD31fkfeNKQmfLj7ODcEfkb5JLsKrXVSqgnfGg8=
@@ -46,12 +50,16 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/clarketm/json v1.14.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -50,8 +53,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/coreos/go-json v0.0.0-20211020211907-c63f628265de h1:qZvNu52Tv7Jfbgxdw3ONHf0BK9UpuSxi9FA9Y+qU5VU=
github.com/coreos/go-json v0.0.0-20211020211907-c63f628265de/go.mod h1:lryFBkhadOfv8Jue2Vr/f/Yviw8h1DQPQojbXqEChY0=
@ -40,15 +34,12 @@ index 097b98c7..afe8e529 100644
github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 h1:pfSsrvbjUFGINaPGy0mm2QKQKTdq7IcbUa+nQwsz2UM=
@@ -62,10 +70,18 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
@@ -62,10 +68,15 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
+github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
+github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
+github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
+github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
+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/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@ -59,7 +50,7 @@ index 097b98c7..afe8e529 100644
github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -117,20 +133,25 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
@@ -117,20 +128,24 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@ -73,7 +64,6 @@ index 097b98c7..afe8e529 100644
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@ -85,20 +75,18 @@ index 097b98c7..afe8e529 100644
github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus=
github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -138,6 +159,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
@@ -138,6 +153,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs=
+github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
+github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -147,8 +174,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
@@ -147,8 +166,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
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=
@ -109,17 +97,16 @@ index 097b98c7..afe8e529 100644
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -157,6 +186,9 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -157,6 +178,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk=
+go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+go4.org v0.0.0-20200104003542-c7e774b10ea0 h1:M6XsnQeLwG+rHQ+/rrGh3puBI3WZEy9TBWmf2H+enQA=
+go4.org v0.0.0-20200104003542-c7e774b10ea0/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-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -198,6 +230,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
@@ -198,6 +221,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/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=
@ -127,7 +114,7 @@ index 097b98c7..afe8e529 100644
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -261,8 +294,9 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq
@@ -261,8 +285,9 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@ -138,7 +125,7 @@ index 097b98c7..afe8e529 100644
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -272,6 +306,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
@@ -272,6 +297,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@ -146,7 +133,7 @@ index 097b98c7..afe8e529 100644
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -386,8 +421,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
@@ -386,8 +412,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

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

File diff suppressed because it is too large Load Diff

2625
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-add-ignition-translation.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

27
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch vendored
View File

@ -1,7 +1,7 @@
From 04bd109f4d6512c80bbd5b2fe0903de2a4dd1d80 Mon Sep 17 00:00:00 2001
From ab4a9ade5b2e43a4d164392becf8d421256d8ffa Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:20:09 +0200
Subject: [PATCH 05/15] config/v3_4: convert ignition 2.x to 3.4-exp
Subject: [PATCH 06/16] config/v3_4: convert ignition 2.x to 3.4-exp
if the version of ignition is 2.x we convert it to 3.4-exp using
ign-converter.
@ -10,14 +10,14 @@ it should support any 2.x version (or at the least the last 2 releases)
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
config/v3_4_experimental/config.go | 38 ++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
config/v3_4_experimental/config.go | 37 ++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/config/v3_4_experimental/config.go b/config/v3_4_experimental/config.go
index 512fc9f0..b0375236 100644
index 097dbd83..e666c876 100644
--- a/config/v3_4_experimental/config.go
+++ b/config/v3_4_experimental/config.go
@@ -15,6 +15,10 @@
@@ -15,9 +15,14 @@
package v3_4_experimental
import (
@ -28,16 +28,11 @@ index 512fc9f0..b0375236 100644
"github.com/flatcar/ignition/v2/config/merge"
"github.com/flatcar/ignition/v2/config/shared/errors"
"github.com/flatcar/ignition/v2/config/util"
@@ -25,6 +29,8 @@ import (
"github.com/coreos/go-semver/semver"
"github.com/coreos/vcontext/report"
+
+ "github.com/flatcar/ign-converter/translate/v24tov31"
)
func Merge(parent, child types.Config) types.Config {
@@ -67,6 +73,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) {
+ "github.com/flatcar/ignition/v2/config/v24tov31"
prev "github.com/flatcar/ignition/v2/config/v3_3"
"github.com/flatcar/ignition/v2/config/v3_4_experimental/translate"
"github.com/flatcar/ignition/v2/config/v3_4_experimental/types"
@@ -67,6 +72,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) {
return types.Config{}, rpt, err
}

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch → 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 731c4c00c7056f4b3333ca0dbe25e0c3b348588a Mon Sep 17 00:00:00 2001
From c4a13286d36151f7b1b612cca5ceb5e2fdc1306b Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
Date: Fri, 30 Jul 2021 14:21:31 +0200
Subject: [PATCH 06/15] internal/prv/cmdline: backport flatcar patch
Subject: [PATCH 07/16] internal/prv/cmdline: backport flatcar patch
this patch provides backward compatibility for various config
key
@ -12,7 +12,7 @@ Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go
index 0068ed66..80b3af95 100644
index c8006f02..a2d00627 100644
--- a/internal/providers/cmdline/cmdline.go
+++ b/internal/providers/cmdline/cmdline.go
@@ -33,7 +33,9 @@ import (

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch → 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 b49c1ecc919a21ff90b71b6a0e67b15600157ad3 Mon Sep 17 00:00:00 2001
From 8eb60d346a2b792b6fb53fc7066ef4ba789974f9 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
Date: Fri, 13 Aug 2021 11:47:01 +0200
Subject: [PATCH 07/15] provider/qemu: apply fw_cfg patch
Subject: [PATCH 08/16] 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 <mathieu@kinvolk.io>
1 file changed, 68 insertions(+), 55 deletions(-)
diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go
index a4ebec6a..0ae9cd66 100644
index 46ab7ae0..2de49881 100644
--- a/internal/providers/qemu/qemu_fwcfg.go
+++ b/internal/providers/qemu/qemu_fwcfg.go
@@ -30,6 +30,7 @@ import (

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

@ -1,7 +1,7 @@
From c0105a1aeaf1650b74324457c364ac7e377d80a6 Mon Sep 17 00:00:00 2001
From 31c8a45bd9468de7e348f28301d979614ae25c83 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mathieu@kinvolk.io>
Date: Thu, 2 Sep 2021 11:03:17 +0200
Subject: [PATCH 08/15] config/3_4/test: add ignition 2.x test cases
Subject: [PATCH 09/16] config/3_4/test: add ignition 2.x test cases
Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
---
@ -9,7 +9,7 @@ Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
1 file changed, 20 insertions(+)
diff --git a/config/v3_4_experimental/config_test.go b/config/v3_4_experimental/config_test.go
index 7ff31ee8..224c277a 100644
index e334ca85..eaa817be 100644
--- a/config/v3_4_experimental/config_test.go
+++ b/config/v3_4_experimental/config_test.go
@@ -149,6 +149,26 @@ func TestParse(t *testing.T) {

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch → 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 36a3efc8dfec1b06ee8df97ac87e08f9650cdd24 Mon Sep 17 00:00:00 2001
From 455292b4dc604c8a4195abf8be5386ff2600ad57 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 22 Sep 2021 14:53:49 +0200
Subject: [PATCH 09/15] internal/disk/fs: ignore fs format mismatches for the
Subject: [PATCH 10/16] 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 ef9028bf..dd251b28 100644
index b7f3795a..4de09498 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 {

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch → 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 840957aac96dee2c954fd821d14e7b41b3979dc7 Mon Sep 17 00:00:00 2001
From 7b83d08d8d38f5596f1f7b97b6bfa749631d45e0 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:34:32 +0200
Subject: [PATCH 10/15] VMware: Fix guestinfo.*.config.data and *.config.url
Subject: [PATCH 11/16] VMware: Fix guestinfo.*.config.data and *.config.url
variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -25,7 +25,7 @@ Co-authored-by: Kai Lüke <kailuke@microsoft.com>
1 file changed, 74 insertions(+), 22 deletions(-)
diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go
index 66ff5490..327ad52b 100644
index 0c2f0d97..3c3d1634 100644
--- a/internal/providers/vmware/vmware_amd64.go
+++ b/internal/providers/vmware/vmware_amd64.go
@@ -19,6 +19,7 @@ package vmware

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch → 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 f36f9b24499b1c191538857a3f9faa97008db403 Mon Sep 17 00:00:00 2001
From 0e139432041a218d7c24cfe9a8844a0bbcb9f3f8 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 2 Feb 2022 13:27:18 +0100
Subject: [PATCH 11/15] config/version: handle configuration version 1
Subject: [PATCH 12/16] 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
@ -13,7 +13,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/config/util/config.go b/config/util/config.go
index 9fb88d8e..89d815b8 100644
index 4cdd83b7..f701f4a1 100644
--- a/config/util/config.go
+++ b/config/util/config.go
@@ -14,6 +14,8 @@

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch → 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 45c15e838db7ef17cf4ff391195eb4548b5b509e Mon Sep 17 00:00:00 2001
From 7fd14391857664ac4415f18b0189f17b9732a852 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 22 Feb 2022 15:41:13 +0100
Subject: [PATCH 12/15] config/util: add cloud init detection to initial
Subject: [PATCH 13/16] config/util: add cloud init detection to initial
parsing
we detect if the config is not an ignition one (script/cloudinit) and we
@ -13,7 +13,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
1 file changed, 39 insertions(+)
diff --git a/config/util/parsingErrors.go b/config/util/parsingErrors.go
index 5e2b4a2b..061a488d 100644
index 865d75d2..914bf2bf 100644
--- a/config/util/parsingErrors.go
+++ b/config/util/parsingErrors.go
@@ -15,7 +15,12 @@

26
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch → 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 c53d44fd2f59c9cefdc699d55007a92dbbd0f292 Mon Sep 17 00:00:00 2001
From ed6ea4bd260ff916a55731172b3299067989aa9a Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 25 May 2022 10:38:16 +0200
Subject: [PATCH 13/15] Revert "*: drop OEM URI support"
Subject: [PATCH 14/16] Revert "*: drop OEM URI support"
This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3.
---
@ -21,7 +21,7 @@ This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3.
13 files changed, 242 insertions(+), 9 deletions(-)
diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go
index 90d903f2..33b7643a 100644
index 2d8c44b1..f560bc22 100644
--- a/config/v3_0/types/url.go
+++ b/config/v3_0/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
@ -34,7 +34,7 @@ index 90d903f2..33b7643a 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_1/types/url.go b/config/v3_1/types/url.go
index 90d903f2..33b7643a 100644
index 2d8c44b1..f560bc22 100644
--- a/config/v3_1/types/url.go
+++ b/config/v3_1/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
@ -47,7 +47,7 @@ index 90d903f2..33b7643a 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_2/types/url.go b/config/v3_2/types/url.go
index bb90bdf9..8f3da4d9 100644
index bf1f3a5e..63297beb 100644
--- a/config/v3_2/types/url.go
+++ b/config/v3_2/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
@ -60,7 +60,7 @@ index bb90bdf9..8f3da4d9 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_3/types/url.go b/config/v3_3/types/url.go
index bb90bdf9..8f3da4d9 100644
index bf1f3a5e..63297beb 100644
--- a/config/v3_3/types/url.go
+++ b/config/v3_3/types/url.go
@@ -30,7 +30,7 @@ func validateURL(s string) error {
@ -73,7 +73,7 @@ index bb90bdf9..8f3da4d9 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/config/v3_4_experimental/types/url.go b/config/v3_4_experimental/types/url.go
index f094cde8..72b1b37b 100644
index 9b2b4405..5258c3c6 100644
--- a/config/v3_4_experimental/types/url.go
+++ b/config/v3_4_experimental/types/url.go
@@ -32,7 +32,7 @@ func validateURL(s string) error {
@ -98,7 +98,7 @@ index 9ecb590a..f7bb4b40 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 0fe37f4a..3afc587f 100644
index 703385ea..644c42c4 100644
--- a/internal/distro/distro.go
+++ b/internal/distro/distro.go
@@ -23,13 +23,17 @@ import (
@ -137,7 +137,7 @@ index 0fe37f4a..3afc587f 100644
func GroupaddCmd() string { return groupaddCmd }
func GroupdelCmd() string { return groupdelCmd }
diff --git a/internal/resource/url.go b/internal/resource/url.go
index 25993094..8ed6efdb 100644
index ca9c8668..f7fa5edc 100644
--- a/internal/resource/url.go
+++ b/internal/resource/url.go
@@ -27,13 +27,17 @@ import (
@ -271,7 +271,7 @@ index 25993094..8ed6efdb 100644
+ )
+}
diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go
index 5b586619..442d2199 100644
index a5ebb450..84f969bb 100644
--- a/tests/blackbox_test.go
+++ b/tests/blackbox_test.go
@@ -140,13 +140,19 @@ func outer(t *testing.T, test types.Test, negativeTests bool) error {
@ -309,7 +309,7 @@ index 5b586619..442d2199 100644
if !negativeTests {
if err := runIgnition(t, ctx, "fetch", "", tmpDirectory, appendEnv); err != nil {
diff --git a/tests/negative/files/missing_file.go b/tests/negative/files/missing_file.go
index 613adb82..8077fd14 100644
index 251f5593..4f6a9801 100644
--- a/tests/negative/files/missing_file.go
+++ b/tests/negative/files/missing_file.go
@@ -23,6 +23,7 @@ func init() {
@ -351,7 +351,7 @@ index 613adb82..8077fd14 100644
+ }
+}
diff --git a/tests/negative/general/config.go b/tests/negative/general/config.go
index e5302154..dd717a48 100644
index ed960f97..d950bd3a 100644
--- a/tests/negative/general/config.go
+++ b/tests/negative/general/config.go
@@ -29,12 +29,14 @@ func init() {
@ -434,7 +434,7 @@ index e5302154..dd717a48 100644
name := "config.version.2.5.0-exp"
in := types.GetBaseDisk()
diff --git a/tests/positive/files/remote.go b/tests/positive/files/remote.go
index 3c9ee830..171c6f83 100644
index 792bdae7..9117e651 100644
--- a/tests/positive/files/remote.go
+++ b/tests/positive/files/remote.go
@@ -29,6 +29,7 @@ func init() {

6
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch → 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 9212d688c63fab92b2e9d808df04bf75ca86726d Mon Sep 17 00:00:00 2001
From bbaf408f59b4dfebedc43236705f717e1dcea371 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 14/15] internal/resource/url: support btrfs as OEM partition
Subject: [PATCH 15/16] 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 8ed6efdb..d92cefac 100644
index f7fa5edc..15e13778 100644
--- a/internal/resource/url.go
+++ b/internal/resource/url.go
@@ -699,8 +699,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error {

12
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch vendored
View File

@ -1,7 +1,7 @@
From 02dcfeec54df967069efb330971e1a651753a58a Mon Sep 17 00:00:00 2001
From a0bf53e18fc9de8f6bce2f37faf9e5810a7faa18 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Fri, 11 Feb 2022 15:41:12 +0100
Subject: [PATCH 15/15] internal/exec/stages/disks: prevent races with udev
Subject: [PATCH 16/16] internal/exec/stages/disks: prevent races with udev
The "udevadm settle" command used to wait for udev to process the disk
changes and recreate the entries under /dev was still prone to races
@ -29,7 +29,7 @@ be done for LUKS.
4 files changed, 78 insertions(+), 29 deletions(-)
diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go
index 285e7e4a..b4c2bede 100644
index 4bb3e459..23bb7866 100644
--- a/internal/exec/stages/disks/disks.go
+++ b/internal/exec/stages/disks/disks.go
@@ -22,6 +22,7 @@ import (
@ -110,7 +110,7 @@ index 285e7e4a..b4c2bede 100644
return nil
diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go
index dd251b28..2a383e0a 100644
index 4de09498..ed7430fa 100644
--- a/internal/exec/stages/disks/filesystems.go
+++ b/internal/exec/stages/disks/filesystems.go
@@ -210,6 +210,29 @@ func (s stage) createFilesystem(fs types.Filesystem) error {
@ -144,7 +144,7 @@ index dd251b28..2a383e0a 100644
}
diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go
index 99189da0..1da966e7 100644
index fee39c0a..feb006bd 100644
--- a/internal/exec/stages/disks/partitions.go
+++ b/internal/exec/stages/disks/partitions.go
@@ -394,5 +394,14 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error {
@ -163,7 +163,7 @@ index 99189da0..1da966e7 100644
return nil
}
diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go
index dff93413..7840d8fc 100644
index 2781131b..2da3f5ec 100644
--- a/internal/exec/stages/disks/raid.go
+++ b/internal/exec/stages/disks/raid.go
@@ -22,6 +22,7 @@ package disks

79
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch vendored
View File

@ -1,79 +0,0 @@
From 9c0bfb9d652d7446e7d2af28e42622a9371708c6 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 27 Jul 2022 10:35:37 +0200
Subject: [PATCH] mod: bump ign-converter to pull networkd fix
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
go.mod | 2 +-
go.sum | 4 ++--
.../ign-converter/translate/v24tov31/v24tov31.go | 4 ++--
vendor/modules.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 9b5da9f3..3e201cfd 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd/v22 v22.0.0
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
- github.com/flatcar/ign-converter v0.2.0
+ github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0
github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
github.com/google/renameio v0.1.0
github.com/google/uuid v1.1.1
diff --git a/go.sum b/go.sum
index afe8e529..82290ed3 100644
--- a/go.sum
+++ b/go.sum
@@ -70,8 +70,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
-github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
+github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ=
+github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
diff --git a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
index d10cd7c3..f940b421 100644
--- a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
+++ b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go
@@ -534,7 +534,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi
file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name)
// URL encoding unit content to follow 'data' format - we could use base64 also.
- file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(u.Contents))
+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.PathEscape(u.Contents))
ret = append(ret, file)
}
@@ -552,7 +552,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi
}
file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", string(u.Name)+".d", d.Name)
- file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(d.Contents))
+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.PathEscape(d.Contents))
ret = append(ret, file)
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 71ec1839..3e8983d0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/coreos/vcontext/tree
github.com/coreos/vcontext/validate
# github.com/davecgh/go-spew v1.1.0
github.com/davecgh/go-spew/spew
-# github.com/flatcar/ign-converter v0.2.0
+# github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0
## explicit
github.com/flatcar/ign-converter/translate/v24tov31
github.com/flatcar/ign-converter/util
--
2.35.1

43
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/README.md vendored Normal file
View File

@ -0,0 +1,43 @@
# Ignition patches
These patches bring Flatcar custom features (from a runtime execution point-of-view) to CoreOS's Ignition.
## Sync Ignition with the upstream
When a new upstream Ignition release is out, we need to backport the Flatcar patches on this new version.
For this, we can just apply the current patches and fix any broken stuff:
```bash
git clone https://github.com/coreos/ignition
cd ignition
git checkout "${RELEASE}"
git am --3way /path/to/coreos-overlay/sys-apps/ignition/files/00*
```
Once done, we can generate the new set of patches:
```
git format-patch "${RELEASE}"
```
Copy the new patches to `::coreos-overlay`
```
cp 00* /path/to/coreos-overlay/sys-apps/ignition/files/
```
:warning: We might need to update the applied patches' names in the Ignition ebuild.
When the new Ignition release adds a higher config version used from `config/config.go`, you also have to modify `files/0006-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch` to be applied for this higher config version.
Note: the translation lifts to v3.1 and if it ever would be the same version as the highest, you also need to set the local `version` varable to meet the `if version == types.MaxVersion {` check.
## Ignition converter (ign-converter)
This converter is the central piece of auto-translation from Ignition config version 2 to Ignition config version 3. While we still support both version, we need to maintain it. It was initially on `coreos/ign-converter` then it has moved to `flatcar/ign-converter` to apply some logic (that could be upstreamed).
To ease the process with the previous section, we decided to "merge" ign-converter with Ignition. It's actually a copy of the package `v24tov31` and the associated tests to `config/v24tov31/` (and `config/util/translate.go`).
If we drop the support for Ignition config version 2, we can drop the following patches:
* `mod: add flatcar/ignition@0.36.2`
* `sum: go mod tidy`
* `vendor: go mod vendor`
* `config: add ignition translation`
* `config/v3_4: convert ignition 2.x to 3.4-exp`

0
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r3.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r4.ebuild vendored
View File

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

@ -42,22 +42,22 @@ RDEPEND="
RDEPEND+="${DEPEND}"
PATCHES=(
"${FILESDIR}/0001-sed-s-coreos-flatcar-linux.patch"
"${FILESDIR}/0002-mod-add-ign-converter-dependency.patch"
"${FILESDIR}/0001-sed-s-coreos-flatcar.patch"
"${FILESDIR}/0002-mod-add-flatcar-ignition-0.36.2.patch"
"${FILESDIR}/0003-sum-go-mod-tidy.patch"
"${FILESDIR}/0004-vendor-go-mod-vendor.patch"
"${FILESDIR}/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch"
"${FILESDIR}/0006-internal-prv-cmdline-backport-flatcar-patch.patch"
"${FILESDIR}/0007-provider-qemu-apply-fw_cfg-patch.patch"
"${FILESDIR}/0008-config-3_4-test-add-ignition-2.x-test-cases.patch"
"${FILESDIR}/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch"
"${FILESDIR}/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch"
"${FILESDIR}/0011-config-version-handle-configuration-version-1.patch"
"${FILESDIR}/0012-config-util-add-cloud-init-detection-to-initial-pars.patch"
"${FILESDIR}/0013-Revert-drop-OEM-URI-support.patch"
"${FILESDIR}/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch"
"${FILESDIR}/0015-internal-exec-stages-disks-prevent-races-with-udev.patch"
"${FILESDIR}/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch"
"${FILESDIR}/0005-config-add-ignition-translation.patch"
"${FILESDIR}/0006-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch"
"${FILESDIR}/0007-internal-prv-cmdline-backport-flatcar-patch.patch"
"${FILESDIR}/0008-provider-qemu-apply-fw_cfg-patch.patch"
"${FILESDIR}/0009-config-3_4-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"
"${FILESDIR}/0013-config-util-add-cloud-init-detection-to-initial-pars.patch"
"${FILESDIR}/0014-Revert-drop-OEM-URI-support.patch"
"${FILESDIR}/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch"
"${FILESDIR}/0016-internal-exec-stages-disks-prevent-races-with-udev.patch"
)
src_compile() {