sys-apps/ignition: bump to 2.19.0

Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar · Jun 7, 2024 · 7915f23 · 7915f23
1 parent a91715a
commit 7915f23
Show file tree

Hide file tree

Showing 24 changed files with 223 additions and 276 deletions.
diff --git a/changelog/updates/2024-06-07-ignition.md b/changelog/updates/2024-06-07-ignition.md
@@ -0,0 +1 @@
+- Ignition ([2.19.0](https://coreos.github.io/ignition/release-notes/#ignition-2190-2024-06-05))
diff --git a/...er/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch b/...er/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch
diff --git a/...d_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/...d_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch
@@ -1,4 +1,4 @@
-From 716283d11f3ca67e5f1a17970fb7660fb05641ab Mon Sep 17 00:00:00 2001
+From 344f72895161d411b733a245f5d3e249ef3466fe Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Mon, 26 Sep 2022 12:12:04 +0200
 Subject: [PATCH 02/21] config: add ignition translation
@@ -7,14 +7,28 @@ it's a merge from flatcar/ign-converter
 
 Signed-off-by: Mathieu Tortuyaux <[email protected]>
 ---
+ build                            |    2 +-
  config/util/translate.go         |  166 +++
  config/v24tov31/v24tov31.go      |  729 +++++++++++++
  config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++
- 3 files changed, 2587 insertions(+)
+ 4 files changed, 2588 insertions(+), 1 deletion(-)
  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
@@ -2621,5 +2635,5 @@ index 00000000..e81f6bed
 +	}
 +}
 -- 
-2.43.0
+2.43.2
 
diff --git a/...d_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/...d_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch
@@ -1,6 +1,6 @@
-From 37cff851d08cd24c8590ef4072436aa5184b9a36 Mon Sep 17 00:00:00 2001
+From a0b0b93a5794d15ac1dcf9cf504bc3b3bafd03ba Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
-Date: Mon, 4 Mar 2024 14:55:33 +0100
+Date: Fri, 7 Jun 2024 09:09:18 +0200
 Subject: [PATCH 03/21] mod: add flatcar/[email protected]
 
 it's required for Ignition conversion.
@@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/go.mod b/go.mod
-index c24348db..5f74f954 100644
+index 42f7800d..5eb792c3 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -11,6 +11,7 @@ require (
@@ -22,24 +22,24 @@ index c24348db..5f74f954 100644
  	github.com/google/renameio/v2 v2.0.0
  	github.com/google/uuid v1.6.0
  	github.com/mdlayher/vsock v1.2.1
-@@ -31,7 +32,9 @@ require (
- 	cloud.google.com/go v0.112.0 // indirect
- 	cloud.google.com/go/compute v1.23.4 // indirect
- 	cloud.google.com/go/iam v1.1.6 // indirect
+@@ -32,7 +33,9 @@ require (
+ 	cloud.google.com/go/auth v0.4.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
  	github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
 +	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
  	github.com/davecgh/go-spew v1.1.1 // indirect
  	github.com/felixge/httpsnoop v1.0.4 // indirect
  	github.com/go-logr/logr v1.4.1 // indirect
-@@ -52,6 +55,7 @@ require (
- 	go.opentelemetry.io/otel v1.23.0 // indirect
- 	go.opentelemetry.io/otel/metric v1.23.0 // indirect
- 	go.opentelemetry.io/otel/trace v1.23.0 // indirect
+@@ -53,6 +56,7 @@ require (
+ 	go.opentelemetry.io/otel v1.24.0 // indirect
+ 	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.19.0 // indirect
- 	golang.org/x/sync v0.6.0 // indirect
- 	golang.org/x/text v0.14.0 // 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
 -- 
-2.43.0
+2.43.2
 
diff --git a/...ntainer/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/...ntainer/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch
@@ -1,29 +1,29 @@
-From c7206a8d87a56aac24d4cb7306fc63a239dbca19 Mon Sep 17 00:00:00 2001
+From 07123c1685d70b571a599eb5869acccf7f95f69f Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
-Date: Mon, 4 Mar 2024 14:55:43 +0100
+Date: Fri, 7 Jun 2024 09:09:50 +0200
 Subject: [PATCH 04/21] sum: go mod tidy
 
 Signed-off-by: Mathieu Tortuyaux <[email protected]>
 ---
- go.sum | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
+ go.sum | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/go.sum b/go.sum
-index dac484dc..4afcd5be 100644
+index f92fb462..74444e57 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -10,6 +10,9 @@ cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWO
- cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg=
- cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY=
+@@ -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=
  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.50.25 h1:vhiHtLYybv1Nhx3Kv18BBC6L0aPJHaG9aeEsr92W99c=
- github.com/aws/aws-sdk-go v1.50.25/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
- github.com/beevik/etree v1.3.0 h1:hQTc+pylzIKDb23yYprodCWWTt+ojFfUZyzU09a/hmU=
-@@ -22,8 +25,11 @@ github.com/containers/libhvee v0.6.0 h1:tUzwSz8R0GjR6IctgDnkTMjdtCk5Mxhpai4Vyv6U
- github.com/containers/libhvee v0.6.0/go.mod h1:f/q1wCdQqOLiK3IZqqBfOD7exMZYBU5pDYsrMa/pSFg=
+ 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/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs=
+@@ -23,8 +26,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=
 +github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -34,8 +34,8 @@ index dac484dc..4afcd5be 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/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
- github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
+@@ -38,11 +44,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=
 +github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4=
@@ -50,10 +50,10 @@ index dac484dc..4afcd5be 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=
-@@ -83,10 +93,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF
+@@ -80,10 +90,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.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM=
- github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc=
+ 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/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 dac484dc..4afcd5be 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=
-@@ -95,16 +108,22 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1
+@@ -92,16 +105,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,44 +87,52 @@ index dac484dc..4afcd5be 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=
-@@ -112,8 +131,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
- github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+@@ -109,8 +128,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=
 +github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
  github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY=
  github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk=
 +github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
- github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
  go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
  go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-@@ -128,6 +149,8 @@ go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms
- go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
- go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI=
- go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk=
+ 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
+ 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=
 +go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk=
 +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.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-@@ -142,6 +165,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
+ 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/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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
  golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-@@ -182,6 +206,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
+ 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/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/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
  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/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
- golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-@@ -225,8 +250,9 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7
- google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+ 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=
  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=
@@ -135,5 +143,5 @@ index dac484dc..4afcd5be 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.0
+2.43.2
 
diff --git a/...er/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch b/...er/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch
@@ -1,6 +1,6 @@
-From 59381307c3483608d300401208ad6f88d68c1cc6 Mon Sep 17 00:00:00 2001
+From 61fedb620afb81ec657419e0835439c03cc14c04 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
-Date: Mon, 4 Mar 2024 14:56:54 +0100
+Date: Fri, 7 Jun 2024 09:10:35 +0200
 Subject: [PATCH 05/21] vendor: go mod vendor
 
 Signed-off-by: Mathieu Tortuyaux <[email protected]>
@@ -17029,20 +17029,20 @@ index 00000000..1b1efb0f
 +	return
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 8ce5cb4d..a4d3a6dd 100644
+index 765c8cb6..d1184cea 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -20,6 +20,9 @@ cloud.google.com/go/storage
+@@ -36,6 +36,9 @@ cloud.google.com/go/storage
  cloud.google.com/go/storage/internal
  cloud.google.com/go/storage/internal/apiv2
  cloud.google.com/go/storage/internal/apiv2/storagepb
 +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437
 +## explicit
 +github.com/ajeddeloh/go-json
- # github.com/aws/aws-sdk-go v1.50.25
+ # github.com/aws/aws-sdk-go v1.53.5
  ## explicit; go 1.19
  github.com/aws/aws-sdk-go/aws
-@@ -87,6 +90,9 @@ github.com/coreos/go-json
+@@ -103,6 +106,9 @@ github.com/coreos/go-json
  # github.com/coreos/go-semver v0.3.1
  ## explicit; go 1.8
  github.com/coreos/go-semver/semver
@@ -17052,7 +17052,7 @@ index 8ce5cb4d..a4d3a6dd 100644
  # github.com/coreos/go-systemd/v22 v22.5.0
  ## explicit; go 1.12
  github.com/coreos/go-systemd/v22/dbus
-@@ -105,6 +111,27 @@ github.com/davecgh/go-spew/spew
+@@ -121,6 +127,27 @@ github.com/davecgh/go-spew/spew
  # github.com/felixge/httpsnoop v1.0.4
  ## explicit; go 1.13
  github.com/felixge/httpsnoop
@@ -17080,16 +17080,16 @@ index 8ce5cb4d..a4d3a6dd 100644
  # github.com/go-logr/logr v1.4.1
  ## explicit; go 1.18
  github.com/go-logr/logr
-@@ -253,6 +280,9 @@ go.opentelemetry.io/otel/metric/noop
+@@ -264,6 +291,9 @@ go.opentelemetry.io/otel/metric/noop
  ## explicit; go 1.20
  go.opentelemetry.io/otel/trace
  go.opentelemetry.io/otel/trace/embedded
 +# go4.org v0.0.0-20160314031811-03efcb870d84
 +## explicit
 +go4.org/errorutil
- # golang.org/x/crypto v0.19.0
+ # golang.org/x/crypto v0.23.0
  ## explicit; go 1.18
  golang.org/x/crypto/chacha20
 -- 
-2.43.0
+2.43.2
 
diff --git a/...coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch b/...coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch
@@ -1,4 +1,4 @@
-From 4aebd9b560eb32fb6961846112985efc2ebfa867 Mon Sep 17 00:00:00 2001
+From 7ad89a545ac31d4308d94c11e5c808e04fd10ce1 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 25 May 2022 10:20:09 +0200
 Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x
@@ -72,5 +72,5 @@ index f0d4bb84..dccc5c4c 100644
  		return Parse(raw)
  	}
 -- 
-2.43.0
+2.43.2
 
diff --git a/...os-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/...os-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch
@@ -1,4 +1,4 @@
-From 9d97af5dd7cb5f6f301e970cdc24126d8a764c19 Mon Sep 17 00:00:00 2001
+From 618ac3e4556fc03eae599b736eff2086d9a95722 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Mon, 19 Feb 2024 18:12:22 +0100
 Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch
@@ -36,5 +36,5 @@ index eb8e2b45..0561438a 100644
  		}
 
 -- 
-2.43.0
+2.43.2
 
diff --git a/..._party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/..._party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch
@@ -1,4 +1,4 @@
-From 77f3bc5ddd558f75c3239ebf35ee6f430bcda016 Mon Sep 17 00:00:00 2001
+From 3e06976d9deb99b7979638505541d2166d00f8d9 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Tue, 20 Feb 2024 10:02:28 +0100
 Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch
@@ -159,5 +159,5 @@ index a150869f..e233865a 100644
 +
  }
 -- 
-2.43.0
+2.43.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Ignition ([2.19.0](https://coreos.github.io/ignition/release-notes/#ignition-2190-2024-06-05))