diff --git a/projects/tinkerbell/hub/CEXEC_ATTRIBUTION.txt b/projects/tinkerbell/hub/CEXEC_ATTRIBUTION.txt index b30eb8e4d2..ec267afbd1 100644 --- a/projects/tinkerbell/hub/CEXEC_ATTRIBUTION.txt +++ b/projects/tinkerbell/hub/CEXEC_ATTRIBUTION.txt @@ -1,6 +1,6 @@ -** github.com/tinkerbell/hub/actions/cexec/v1; version 404dab73a8a7f33e973c6e71782f07e82b125da9 -- -https://github.com/tinkerbell/hub/actions/cexec/v1 +** github.com/tinkerbell/actions/cexec; version d524b77c7a44525c4318da3d2b5857c03711f3f8 -- +https://github.com/tinkerbell/actions Apache License @@ -207,10 +207,10 @@ https://github.com/tinkerbell/hub/actions/cexec/v1 ------ -** golang.org/go; version go1.17.13 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/sys/unix; version v0.0.0-20200420163511-1957bb5e6d1f -- +** golang.org/x/sys/unix; version v0.13.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -243,7 +243,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/sirupsen/logrus; version v1.7.0 -- +** github.com/sirupsen/logrus; version v1.9.0 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen diff --git a/projects/tinkerbell/hub/CHECKSUMS b/projects/tinkerbell/hub/CHECKSUMS index 3ac079a77b..32ee585d9c 100644 --- a/projects/tinkerbell/hub/CHECKSUMS +++ b/projects/tinkerbell/hub/CHECKSUMS @@ -1,10 +1,10 @@ -44a34cec86053a6f7a5e44c476c899accf0954c2f3d9ffad31db338526f81ee5 _output/bin/hub/linux-amd64/cexec -e004f52237340707b753fd226c6c369931d9d6c1f966615d6475d4c2fd13dcf0 _output/bin/hub/linux-amd64/image2disk -dcfec6b7c4fc2452defdaaec7a611fbe6cdf00e8e5dae86768447578849a4766 _output/bin/hub/linux-amd64/kexec -cdf00127e3c815c792e3eb7e61fa858095a62afb98bda2714f92e463ca95f0cb _output/bin/hub/linux-amd64/oci2disk -2e11b5eadab9dacba3df8e2b28d7426a342da14c189f0c73fe0f7df66c39c4c7 _output/bin/hub/linux-amd64/writefile -0f112017256dd3811ec477798bc527f3e5407878f766a06c287cdb4a633b168f _output/bin/hub/linux-arm64/cexec -0aac72372e42218ac7068bf9783ace087f8069ceb6eb8a040f74610974b2bb18 _output/bin/hub/linux-arm64/image2disk -9d317f30fa3ee4fe78fdb2f2480790a6ea57fad6c2eea9383fe6929e5ea68e64 _output/bin/hub/linux-arm64/kexec -e97a4c3ef71775028f9f6bed4f03f6e1abc97d843ef6e8ea5f9e1225c9786db0 _output/bin/hub/linux-arm64/oci2disk -cbda03c6c653fc388f1c43d224881ff8eba8f9ea313644c08a0f15ab6fb8720f _output/bin/hub/linux-arm64/writefile +0b0f9f791d35ae1e7cbc40c5d2250980e3b138c28137b51192ab267a17fd1924 _output/bin/hub/linux-amd64/cexec +1504ed9b9a000daa14c534e14d7c3a972b61cb2424ad2fa22dae2ded0d27b6e9 _output/bin/hub/linux-amd64/image2disk +f25af35cdeee5152cbd0524bc842d987ebf81fc94557b4514a533776d9786c9b _output/bin/hub/linux-amd64/kexec +b9f2b0e01942ab23fdbf9694993f42d5749d44a963d471984512ba3938d055ad _output/bin/hub/linux-amd64/oci2disk +18df88c1b007afdf667c3ce8f7470a0da07d9865b812b4b11adc2b85830d2b7d _output/bin/hub/linux-amd64/writefile +7dee2b20ec5b2a9a3aaa32d0e7a2e1393ae50e488e534110279ee587a07f2085 _output/bin/hub/linux-arm64/cexec +5a543095cbfc005b42ed2653615a5bd882f3169143d0c51f70ff45da5c26013d _output/bin/hub/linux-arm64/image2disk +f8297700e295ca22d15bf764b021e3c3931a214c1f15985a653ca523807ee81a _output/bin/hub/linux-arm64/kexec +034bed6318ff9c4d12c4356908c22374388e994dae5079b2f582c1e19d37dafe _output/bin/hub/linux-arm64/oci2disk +88dad081f0a66028175dbe838896dc73065f956e86eb36b2a63242e1fd2829a7 _output/bin/hub/linux-arm64/writefile diff --git a/projects/tinkerbell/hub/GIT_TAG b/projects/tinkerbell/hub/GIT_TAG index b2132c29c6..72d6173e84 100644 --- a/projects/tinkerbell/hub/GIT_TAG +++ b/projects/tinkerbell/hub/GIT_TAG @@ -1 +1 @@ -404dab73a8a7f33e973c6e71782f07e82b125da9 +d524b77c7a44525c4318da3d2b5857c03711f3f8 diff --git a/projects/tinkerbell/hub/GOLANG_VERSION b/projects/tinkerbell/hub/GOLANG_VERSION index b48f322609..d2ab029d32 100644 --- a/projects/tinkerbell/hub/GOLANG_VERSION +++ b/projects/tinkerbell/hub/GOLANG_VERSION @@ -1 +1 @@ -1.17 +1.21 diff --git a/projects/tinkerbell/hub/IMAGE2DISK_ATTRIBUTION.txt b/projects/tinkerbell/hub/IMAGE2DISK_ATTRIBUTION.txt index 32a2889295..5eb17b6dac 100644 --- a/projects/tinkerbell/hub/IMAGE2DISK_ATTRIBUTION.txt +++ b/projects/tinkerbell/hub/IMAGE2DISK_ATTRIBUTION.txt @@ -1,6 +1,9 @@ -** github.com/tinkerbell/hub/actions/image2disk/v1; version 404dab73a8a7f33e973c6e71782f07e82b125da9 -- -https://github.com/tinkerbell/hub/actions/image2disk/v1 +** github.com/klauspost/compress; version v1.17.7 -- +https://github.com/klauspost/compress + +** github.com/tinkerbell/actions/image2disk; version d524b77c7a44525c4318da3d2b5857c03711f3f8 -- +https://github.com/tinkerbell/actions Apache License @@ -207,41 +210,7 @@ https://github.com/tinkerbell/hub/actions/image2disk/v1 ------ -** github.com/klauspost/compress; version v1.11.12 -- -https://github.com/klauspost/compress - -Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) 2019 Klaus Post. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------- - -** github.com/klauspost/compress/snappy; version v1.11.12 -- +** github.com/klauspost/compress/internal/snapref; version v1.17.7 -- https://github.com/klauspost/compress Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. @@ -274,10 +243,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/ulikunitz/xz; version v0.5.10 -- +** github.com/ulikunitz/xz; version v0.5.11 -- https://github.com/ulikunitz/xz -Copyright (c) 2014-2021 Ulrich Kunitz +Copyright (c) 2014-2022 Ulrich Kunitz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -306,10 +275,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.17.13 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/sys/unix; version v0.0.0-20191026070338-33540a1f6037 -- +** golang.org/x/sys/unix; version v0.13.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -367,11 +336,11 @@ SOFTWARE. ------ -** github.com/klauspost/compress/zstd/internal/xxhash; version v1.11.12 -- +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.7 -- https://github.com/klauspost/compress Copyright (c) 2016 Caleb Spare -** github.com/sirupsen/logrus; version v1.7.0 -- +** github.com/sirupsen/logrus; version v1.9.0 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen diff --git a/projects/tinkerbell/hub/KEXEC_ATTRIBUTION.txt b/projects/tinkerbell/hub/KEXEC_ATTRIBUTION.txt index 450a862b6a..ee861c6eb5 100644 --- a/projects/tinkerbell/hub/KEXEC_ATTRIBUTION.txt +++ b/projects/tinkerbell/hub/KEXEC_ATTRIBUTION.txt @@ -1,9 +1,9 @@ -** github.com/spf13/cobra; version v1.1.1 -- +** github.com/spf13/cobra; version v1.1.3 -- https://github.com/spf13/cobra -** github.com/tinkerbell/hub/actions/kexec/v1; version 404dab73a8a7f33e973c6e71782f07e82b125da9 -- -https://github.com/tinkerbell/hub/actions/kexec/v1 +** github.com/tinkerbell/actions/kexec; version d524b77c7a44525c4318da3d2b5857c03711f3f8 -- +https://github.com/tinkerbell/actions Apache License @@ -244,10 +244,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.17.13 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/sys/unix; version v0.0.0-20200420163511-1957bb5e6d1f -- +** golang.org/x/sys/unix; version v0.13.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -280,7 +280,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/sirupsen/logrus; version v1.7.0 -- +** github.com/sirupsen/logrus; version v1.9.0 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen diff --git a/projects/tinkerbell/hub/Makefile b/projects/tinkerbell/hub/Makefile index c2e5231b5f..37a4d53fb9 100644 --- a/projects/tinkerbell/hub/Makefile +++ b/projects/tinkerbell/hub/Makefile @@ -14,7 +14,7 @@ WRITEFILE_IMAGE_COMPONENT=tinkerbell/hub/writefile REBOOT_IMAGE_COMPONENT=tinkerbell/hub/reboot BINARY_TARGET_FILES=cexec kexec image2disk oci2disk writefile -GO_MOD_PATHS=actions/cexec/v1 actions/kexec/v1 actions/image2disk/v1 actions/oci2disk/v1 actions/writefile/v1 +GO_MOD_PATHS=cexec kexec image2disk oci2disk writefile # by default the first target is assumed to be the primary and will produce a attribution with no prefix # for this build we want to prefix all the files CEXEC_ATTRIBUTION_OVERRIDE=cexec @@ -29,7 +29,8 @@ ATTRIBUTION_FILE=$(call TO_UPPER,$(IMAGE_NAME))_ATTRIBUTION.txt PROJECT_DEPENDENCIES=eksa/torvalds/linux BUILDSPEC_DEPENDS_ON_OVERRIDE=torvalds_linux_linux_amd64 torvalds_linux_linux_arm64 -FIX_LICENSES=$(foreach path,$(GO_MOD_PATHS),$(REPO)/$(path)/LICENSE) +# FIX_LICENSES=$(foreach path,$(GO_MOD_PATHS),$(REPO)/$(path)/LICENSE) +FIX_LICENSES=$(REPO)/LICENSE EXCLUDE_FROM_UPGRADE_BUILDSPEC=true diff --git a/projects/tinkerbell/hub/OCI2DISK_ATTRIBUTION.txt b/projects/tinkerbell/hub/OCI2DISK_ATTRIBUTION.txt index 1470e3ac08..3a4d5f3ffa 100644 --- a/projects/tinkerbell/hub/OCI2DISK_ATTRIBUTION.txt +++ b/projects/tinkerbell/hub/OCI2DISK_ATTRIBUTION.txt @@ -2,14 +2,17 @@ ** github.com/containerd/containerd; version v1.4.4 -- https://github.com/containerd/containerd +** github.com/klauspost/compress; version v1.17.7 -- +https://github.com/klauspost/compress + ** github.com/opencontainers/go-digest; version v1.0.0 -- https://github.com/opencontainers/go-digest ** github.com/opencontainers/image-spec/specs-go; version v1.0.1 -- https://github.com/opencontainers/image-spec -** github.com/tinkerbell/hub/actions/oci2disk/v1; version 404dab73a8a7f33e973c6e71782f07e82b125da9 -- -https://github.com/tinkerbell/hub/actions/oci2disk/v1 +** github.com/tinkerbell/actions/oci2disk; version d524b77c7a44525c4318da3d2b5857c03711f3f8 -- +https://github.com/tinkerbell/actions ** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20191108220845-16a3f7862a1a -- https://github.com/googleapis/go-genproto @@ -304,41 +307,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/klauspost/compress; version v1.11.12 -- -https://github.com/klauspost/compress - -Copyright (c) 2012 The Go Authors. All rights reserved. -Copyright (c) 2019 Klaus Post. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------- - -** github.com/klauspost/compress/snappy; version v1.11.12 -- +** github.com/klauspost/compress/internal/snapref; version v1.17.7 -- https://github.com/klauspost/compress Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. @@ -371,10 +340,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/ulikunitz/xz; version v0.5.10 -- +** github.com/ulikunitz/xz; version v0.5.11 -- https://github.com/ulikunitz/xz -Copyright (c) 2014-2021 Ulrich Kunitz +Copyright (c) 2014-2022 Ulrich Kunitz All rights reserved. Redistribution and use in source and binary forms, with or without @@ -403,16 +372,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.17.13 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/net/context/ctxhttp; version v0.0.0-20191004110552-13f9640d40b9 -- +** golang.org/x/net/context/ctxhttp; version v0.17.0 -- https://golang.org/x/net -** golang.org/x/sync; version v0.0.0-20201207232520-09787c993a3a -- +** golang.org/x/sync; version v0.3.0 -- https://golang.org/x/sync -** golang.org/x/sys; version v0.0.0-20210124154548-22da62e12c0c -- +** golang.org/x/sys/unix; version v0.13.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -472,11 +441,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE ------ -** github.com/klauspost/compress/zstd/internal/xxhash; version v1.11.12 -- +** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.7 -- https://github.com/klauspost/compress Copyright (c) 2016 Caleb Spare -** github.com/sirupsen/logrus; version v1.8.1 -- +** github.com/sirupsen/logrus; version v1.9.0 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen diff --git a/projects/tinkerbell/hub/README.md b/projects/tinkerbell/hub/README.md index 8971cf8647..ce79bec101 100644 --- a/projects/tinkerbell/hub/README.md +++ b/projects/tinkerbell/hub/README.md @@ -1,5 +1,5 @@ ## **Hub** -![Version](https://img.shields.io/badge/version-404dab73a8a7f33e973c6e71782f07e82b125da9-blue) +![Version](https://img.shields.io/badge/version-d524b77c7a44525c4318da3d2b5857c03711f3f8-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiQkRkY0htL2tWTlM0QmVLSS9SakxYOHBRTUxJNmczcVM4Nm1Wa0U1TFQvVkRDTHRadys0aEVIOStxc0V4aGxSQzNsdVZlaXV5R1YvaHZaOUZIZnRTTWtzPSIsIml2UGFyYW1ldGVyU3BlYyI6ImZjajIxazcybkxaZVdUR24iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [Hub](https://github.com/tinkerbell/hub) is the repository that contains reusable Tinkerbell Actions. The different images are listed under [/actions](https://github.com/tinkerbell/hub/tree/main/actions). diff --git a/projects/tinkerbell/hub/WRITEFILE_ATTRIBUTION.txt b/projects/tinkerbell/hub/WRITEFILE_ATTRIBUTION.txt index e4795a915f..4717ea5eca 100644 --- a/projects/tinkerbell/hub/WRITEFILE_ATTRIBUTION.txt +++ b/projects/tinkerbell/hub/WRITEFILE_ATTRIBUTION.txt @@ -1,8 +1,8 @@ -** github.com/tinkerbell/hub/actions/writefile/v1; version 404dab73a8a7f33e973c6e71782f07e82b125da9 -- -https://github.com/tinkerbell/hub/actions/writefile/v1 +** github.com/tinkerbell/actions/writefile; version d524b77c7a44525c4318da3d2b5857c03711f3f8 -- +https://github.com/tinkerbell/actions -** github.com/vishvananda/netns; version v0.0.0-20211101163701-50045581ed74 -- +** github.com/vishvananda/netns; version v0.0.4 -- https://github.com/vishvananda/netns @@ -210,7 +210,7 @@ https://github.com/vishvananda/netns ------ -** github.com/insomniacslk/dhcp; version v0.0.0-20220504074936-1ca156eafb9f -- +** github.com/insomniacslk/dhcp; version v0.0.0-20240227161007-c728f5dd21c8 -- https://github.com/insomniacslk/dhcp BSD 3-Clause License @@ -245,7 +245,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/u-root/uio; version v0.0.0-20210528114334-82958018845c -- +** github.com/pierrec/lz4/v4; version v4.1.14 -- +https://github.com/pierrec/lz4/v4 + +Copyright (c) 2015, Pierre Curto +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of xxHash nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +------ + +** github.com/u-root/uio; version v0.0.0-20230220225925-ffce2a382923 -- https://github.com/u-root/uio BSD 3-Clause License @@ -280,13 +314,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.17.13 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go -** golang.org/x/net/bpf; version v0.0.0-20201110031124-69a78807bb2b -- +** golang.org/x/net/bpf; version v0.17.0 -- https://golang.org/x/net -** golang.org/x/sys; version v0.0.0-20210525143221-35b2ab0089ea -- +** golang.org/x/sync/errgroup; version v0.3.0 -- +https://golang.org/x/sync + +** golang.org/x/sys/unix; version v0.13.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -319,15 +356,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/mdlayher/ethernet; version v0.0.0-20190606142754-0394541c37b7 -- -https://github.com/mdlayher/ethernet -Copyright (C) 2015 Matt Layher +** github.com/josharian/native; version v1.1.0 -- +https://github.com/josharian/native + +Copyright 2020 Josh Bleecher Snyder + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------ + +** github.com/mdlayher/packet; version v1.1.2 -- +https://github.com/mdlayher/packet +Copyright (C) 2022 Matt Layher -** github.com/mdlayher/raw; version v0.0.0-20191009151244-50f2db8cc065 -- -https://github.com/mdlayher/raw -Copyright (C) 2015 Matt Layher +** github.com/mdlayher/socket; version v0.4.1 -- +https://github.com/mdlayher/socket +Copyright (C) 2021 Matt Layher -=========== +# MIT License @@ -338,7 +387,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------ -** github.com/sirupsen/logrus; version v1.7.0 -- +** github.com/sirupsen/logrus; version v1.9.0 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen diff --git a/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile-action.patch b/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile-action.patch deleted file mode 100644 index 862a4ede35..0000000000 --- a/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile-action.patch +++ /dev/null @@ -1,123 +0,0 @@ -From f419d5be2d823656215b7351ff80bcf78dcb28a6 Mon Sep 17 00:00:00 2001 -From: Vignesh Goutham Ganesh -Date: Mon, 9 May 2022 12:46:46 -0700 -Subject: [PATCH] Add Bootconfig support to WriteFile action - -Signed-off-by: Vignesh Goutham Ganesh ---- - actions/writefile/v1/go.sum | 6 ------ - actions/writefile/v1/main.go | 30 +++++++++++++++++++++++++++++- - 2 files changed, 29 insertions(+), 7 deletions(-) - -diff --git a/actions/writefile/v1/go.sum b/actions/writefile/v1/go.sum -index 221a802..67a36b2 100644 ---- a/actions/writefile/v1/go.sum -+++ b/actions/writefile/v1/go.sum -@@ -5,7 +5,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs - github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= - github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= --github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= - github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= - github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -@@ -13,21 +12,16 @@ 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/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= - github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= --github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= --github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= - github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= --golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= - golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= - golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= --gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index e5ed3cf..b38ef1c 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -5,6 +5,7 @@ import ( - "fmt" - "io/ioutil" - "os" -+ "os/exec" - "path/filepath" - "strconv" - "strings" -@@ -13,7 +14,10 @@ import ( - log "github.com/sirupsen/logrus" - ) - --const mountAction = "/mountAction" -+const ( -+ mountAction = "/mountAction" -+ bootConfigAction = "/usr/bin/bootconfig" -+) - - func main() { - fmt.Printf("WriteFile - Write file to disk\n------------------------\n") -@@ -23,6 +27,7 @@ func main() { - filePath := os.Getenv("DEST_PATH") - - contents := os.Getenv("CONTENTS") -+ bootconfig := os.Getenv("BOOTCONFIG_CONTENTS") - uid := os.Getenv("UID") - gid := os.Getenv("GID") - mode := os.Getenv("MODE") -@@ -42,6 +47,10 @@ func main() { - log.Fatalf("Could not parse mode: %v", err) - } - -+ if bootconfig != "" && contents != "" { -+ log.Fatal("Both BOOTCONFIG_CONTENTS and CONTENTS cannot be set.") -+ } -+ - fileMode := os.FileMode(modePrime) - - dirModePrime, err := strconv.ParseUint(dirMode, 8, 32) -@@ -82,12 +91,31 @@ func main() { - log.Fatalf("Failed to ensure directory exists: %v", err) - } - -+ // If bootconfig is set, contents will be empty and will serve as output initrd file provided -+ // to bootconfig tool - fqFilePath := filepath.Join(mountAction, filePath) - // Write the file to disk - if err := ioutil.WriteFile(fqFilePath, []byte(contents), fileMode); err != nil { - log.Fatalf("Could not write file %s: %v", filePath, err) - } - -+ if bootconfig != "" { -+ // Write the input bootconfig to file to serve as input to the tool -+ inputFilePath := "/userInputBootConfig" -+ err := ioutil.WriteFile(inputFilePath, []byte(bootconfig), fileMode) -+ if err != nil { -+ log.Fatalf("Could not write file %s: %v", filePath, err) -+ } -+ defer os.Remove(inputFilePath) -+ -+ // Parse through bootconfig if enabled -+ cmd := exec.Command(bootConfigAction, "-a", inputFilePath, fqFilePath) -+ output, err := cmd.Output() -+ if err != nil { -+ log.Fatalf("Error running Bootconfig tool. Err: %v, Output: %s", err, string(output)) -+ } -+ } -+ - if err := os.Chown(fqFilePath, fileUID, fileGID); err != nil { - log.Fatalf("Could not modify ownership of file %s: %v", filePath, err) - } --- -2.24.3 (Apple Git-128) - diff --git a/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile.patch b/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile.patch new file mode 100644 index 0000000000..14827964c7 --- /dev/null +++ b/projects/tinkerbell/hub/patches/0001-Add-Bootconfig-support-to-WriteFile.patch @@ -0,0 +1,87 @@ +From 75704fc95fb60f2514933fe86a19d2446d7870b6 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 18:15:40 -0700 +Subject: [PATCH] Add Bootconfig support to WriteFile + +--- + writefile/main.go | 30 +++++++++++++++++++++++++++++- + 1 file changed, 29 insertions(+), 1 deletion(-) + +diff --git a/writefile/main.go b/writefile/main.go +index 3961281..142046f 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -4,6 +4,7 @@ import ( + "errors" + "fmt" + "os" ++ "os/exec" + "path/filepath" + "strconv" + "strings" +@@ -12,7 +13,10 @@ import ( + log "github.com/sirupsen/logrus" + ) + +-const mountAction = "/mountAction" ++const ( ++ mountAction = "/mountAction" ++ bootConfigAction = "/usr/bin/bootconfig" ++) + + func main() { + fmt.Printf("WriteFile - Write file to disk\n------------------------\n") +@@ -22,6 +26,7 @@ func main() { + filePath := os.Getenv("DEST_PATH") + + contents := os.Getenv("CONTENTS") ++ bootconfig := os.Getenv("BOOTCONFIG_CONTENTS") + uid := os.Getenv("UID") + gid := os.Getenv("GID") + mode := os.Getenv("MODE") +@@ -41,6 +46,10 @@ func main() { + log.Fatalf("Could not parse mode: %v", err) + } + ++ if bootconfig != "" && contents != "" { ++ log.Fatal("Both BOOTCONFIG_CONTENTS and CONTENTS cannot be set.") ++ } ++ + fileMode := os.FileMode(modePrime) + + dirModePrime, err := strconv.ParseUint(dirMode, 8, 32) +@@ -81,12 +90,31 @@ func main() { + log.Fatalf("Failed to ensure directory exists: %v", err) + } + ++ // If bootconfig is set, contents will be empty and will serve as output initrd file provided ++ // to bootconfig tool + fqFilePath := filepath.Join(mountAction, filePath) + // Write the file to disk + if err := os.WriteFile(fqFilePath, []byte(contents), fileMode); err != nil { + log.Fatalf("Could not write file %s: %v", filePath, err) + } + ++ if bootconfig != "" { ++ // Write the input bootconfig to file to serve as input to the tool ++ inputFilePath := "/userInputBootConfig" ++ err := os.WriteFile(inputFilePath, []byte(bootconfig), fileMode) ++ if err != nil { ++ log.Fatalf("Could not write file %s: %v", filePath, err) ++ } ++ defer os.Remove(inputFilePath) ++ ++ // Parse through bootconfig if enabled ++ cmd := exec.Command(bootConfigAction, "-a", inputFilePath, fqFilePath) ++ output, err := cmd.Output() ++ if err != nil { ++ log.Fatalf("Error running Bootconfig tool. Err: %v, Output: %s", err, string(output)) ++ } ++ } ++ + if err := os.Chown(fqFilePath, fileUID, fileGID); err != nil { + log.Fatalf("Could not modify ownership of file %s: %v", filePath, err) + } +-- +2.40.0 + diff --git a/projects/tinkerbell/hub/patches/0002-Get-user-data-from-Hegel-and-write-to-disk.patch b/projects/tinkerbell/hub/patches/0002-Get-user-data-from-Hegel-and-write-to-disk.patch index 69a4eb98be..3f974a5af4 100644 --- a/projects/tinkerbell/hub/patches/0002-Get-user-data-from-Hegel-and-write-to-disk.patch +++ b/projects/tinkerbell/hub/patches/0002-Get-user-data-from-Hegel-and-write-to-disk.patch @@ -1,21 +1,21 @@ -From c1c0cc0dec41e6dacea3e2fffa3bfa37a9a60679 Mon Sep 17 00:00:00 2001 -From: Vignesh Goutham Ganesh -Date: Thu, 19 May 2022 12:56:33 -0700 +From ed0aa858029e768118c76fdbd1b5259e5658f72d Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Wed, 17 Apr 2024 09:56:06 -0700 Subject: [PATCH] Get user-data from Hegel and write to disk -Signed-off-by: Vignesh Goutham Ganesh --- - actions/writefile/v1/main.go | 38 ++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) + writefile/main.go | 43 +++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 39 insertions(+), 4 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 5e91045..83562d4 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -4,8 +4,11 @@ import ( +diff --git a/writefile/main.go b/writefile/main.go +index 9e7d78f..1050187 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -3,8 +3,12 @@ package main + import ( "errors" "fmt" - "io/ioutil" ++ "io" + "net/http" + "net/url" "os" @@ -24,15 +24,19 @@ index 5e91045..83562d4 100644 "path/filepath" "strconv" "strings" -@@ -17,6 +20,7 @@ import ( +@@ -14,8 +18,9 @@ import ( + ) + const ( - mountAction = "/mountAction" - bootConfigAction = "/usr/bin/bootconfig" +- mountAction = "/mountAction" +- bootConfigAction = "/usr/bin/bootconfig" ++ mountAction = "/mountAction" ++ bootConfigAction = "/usr/bin/bootconfig" + hegelUserDataVersion = "2009-04-04" ) func main() { -@@ -28,6 +32,7 @@ func main() { +@@ -27,6 +32,7 @@ func main() { contents := os.Getenv("CONTENTS") bootconfig := os.Getenv("BOOTCONFIG_CONTENTS") @@ -40,7 +44,7 @@ index 5e91045..83562d4 100644 uid := os.Getenv("UID") gid := os.Getenv("GID") mode := os.Getenv("MODE") -@@ -47,8 +52,15 @@ func main() { +@@ -46,8 +52,15 @@ func main() { log.Fatalf("Could not parse mode: %v", err) } @@ -58,7 +62,7 @@ index 5e91045..83562d4 100644 } fileMode := os.FileMode(modePrime) -@@ -91,6 +103,28 @@ func main() { +@@ -90,6 +103,28 @@ func main() { log.Fatalf("Failed to ensure directory exists: %v", err) } @@ -75,7 +79,7 @@ index 5e91045..83562d4 100644 + } + defer resp.Body.Close() + -+ respBody, err := ioutil.ReadAll(resp.Body) ++ respBody, err := io.ReadAll(resp.Body) + if err != nil { + log.Fatalf("Error reading HTTP GET response body: %v", err) + } @@ -88,5 +92,5 @@ index 5e91045..83562d4 100644 // to bootconfig tool fqFilePath := filepath.Join(mountAction, filePath) -- -2.24.3 (Apple Git-128) +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0003-Write-DHCP-offer-to-static-Netplan-file.patch b/projects/tinkerbell/hub/patches/0003-Write-DHCP-offer-to-static-Netplan-file.patch index fed0ef5938..f17ef41417 100644 --- a/projects/tinkerbell/hub/patches/0003-Write-DHCP-offer-to-static-Netplan-file.patch +++ b/projects/tinkerbell/hub/patches/0003-Write-DHCP-offer-to-static-Netplan-file.patch @@ -1,140 +1,17 @@ -From a79c136b5d0c9d880e6ae37461bd6f5ee5c5b585 Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Thu, 9 Jun 2022 10:15:06 -0600 -Subject: [PATCH] Write DHCP offer to static Netplan file: +From cbd30fa6303ed419ceafc099dbe03db21e0e8584 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 18:29:33 -0700 +Subject: [PATCH] Write DHCP offer to static Netplan file -This is useful when the host being provisioned -will run the Boots DHCP server. This happens -when using EKS Anywhere which colocates Boots with -all CAPI Tinkerbell components. These components -are initially created on a Bootstrap cluster, then -a permanent management cluster is created, and all -components, including Boots, are pivoted to this -permanent management cluster. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/go.mod | 3 +- - actions/writefile/v1/go.sum | 68 ++++++++++++- - actions/writefile/v1/main.go | 189 ++++++++++++++++++++++++++++++++++- - 3 files changed, 255 insertions(+), 5 deletions(-) + writefile/main.go | 185 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 185 insertions(+) -diff --git a/actions/writefile/v1/go.mod b/actions/writefile/v1/go.mod -index 58febf6..374846c 100644 ---- a/actions/writefile/v1/go.mod -+++ b/actions/writefile/v1/go.mod -@@ -3,10 +3,11 @@ module github.com/tinkerbell/hub/actions/writefile/v1 - go 1.15 - - require ( -+ github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f - github.com/kr/text v0.2.0 // indirect - github.com/sirupsen/logrus v1.7.0 - github.com/stretchr/testify v1.7.0 // indirect -- golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect -+ github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - ) -diff --git a/actions/writefile/v1/go.sum b/actions/writefile/v1/go.sum -index 67a36b2..3909e4b 100644 ---- a/actions/writefile/v1/go.sum -+++ b/actions/writefile/v1/go.sum -@@ -2,23 +2,87 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc= -+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= -+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= -+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= -+github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f h1:l1QCwn715k8nYkj4Ql50rzEog3WnMdrd4YYMMwemxEo= -+github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= -+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= -+github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg= -+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= - github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= - github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= - github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= - github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= - github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE= -+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y= -+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= -+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o= -+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= -+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 h1:aFkJ6lx4FPip+S+Uw4aTegFMct9shDvP+79PsSxpm3w= -+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg= - github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= - github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= - github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -+github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA= -+github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= -+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg= -+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -+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/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= -+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= --golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea h1:+WiDlPBBaO+h9vPNZi8uJ3k4BkKQB7Iow3aqwHVA5hI= -+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -+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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 7ea1235..23ca768 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -1,28 +1,44 @@ +diff --git a/writefile/main.go b/writefile/main.go +index 1050187..b9148fb 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -1,20 +1,29 @@ package main import ( @@ -143,7 +20,7 @@ index 7ea1235..23ca768 100644 "errors" "fmt" + "html/template" - "io/ioutil" + "io" + "net" "net/http" "net/url" @@ -164,10 +41,7 @@ index 7ea1235..23ca768 100644 ) const ( -- mountAction = "/mountAction" -- bootConfigAction = "/usr/bin/bootconfig" -+ mountAction = "/mountAction" -+ bootConfigAction = "/usr/bin/bootconfig" +@@ -23,6 +32,13 @@ const ( hegelUserDataVersion = "2009-04-04" ) @@ -369,6 +243,5 @@ index 7ea1235..23ca768 100644 + return info +} -- -2.35.1 - +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0004-Modify-write-file-to-read-multiple-HEGEL_URLS.patch b/projects/tinkerbell/hub/patches/0004-Modify-write-file-to-read-multiple-HEGEL_URLS.patch index bfc0156aea..46ec44dfb7 100644 --- a/projects/tinkerbell/hub/patches/0004-Modify-write-file-to-read-multiple-HEGEL_URLS.patch +++ b/projects/tinkerbell/hub/patches/0004-Modify-write-file-to-read-multiple-HEGEL_URLS.patch @@ -1,17 +1,16 @@ -From 4052552ab13b658cb8a31fb88d0703fccfb8db93 Mon Sep 17 00:00:00 2001 -From: Abhinav Pandey -Date: Mon, 20 Jun 2022 17:30:53 -0400 +From 6e25146523affec1c8fc559dbd7f8fedf570877d Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 18:33:09 -0700 Subject: [PATCH] Modify write-file to read multiple HEGEL_URLS -Signed-off-by: Abhinav Pandey --- - actions/writefile/v1/main.go | 58 +++++++++++++++++++++++------------- + writefile/main.go | 58 ++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 21 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 23ca768..cfd9974 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go +diff --git a/writefile/main.go b/writefile/main.go +index b9148fb..8850e49 100644 +--- a/writefile/main.go ++++ b/writefile/main.go @@ -48,7 +48,7 @@ func main() { contents := os.Getenv("CONTENTS") @@ -77,10 +76,10 @@ index 23ca768..cfd9974 100644 + } + defer resp.Body.Close() -- respBody, err := ioutil.ReadAll(resp.Body) +- respBody, err := io.ReadAll(resp.Body) - if err != nil { - log.Fatalf("Error reading HTTP GET response body: %v", err) -+ respBody, err := ioutil.ReadAll(resp.Body) ++ respBody, err := io.ReadAll(resp.Body) + if err != nil { + log.Warnf("Error reading HTTP GET response body: %v", err) + continue @@ -101,5 +100,5 @@ index 23ca768..cfd9974 100644 // If bootconfig is set, contents will be empty and will serve as output initrd file provided -- -2.30.1 (Apple Git-130) +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0005-Create-VLAN-tagged-interface-if-vlan_id-exists-in-pr.patch b/projects/tinkerbell/hub/patches/0005-Create-VLAN-tagged-interface-if-vlan_id-exists-in-pr.patch index ba182ec69b..af8440034b 100644 --- a/projects/tinkerbell/hub/patches/0005-Create-VLAN-tagged-interface-if-vlan_id-exists-in-pr.patch +++ b/projects/tinkerbell/hub/patches/0005-Create-VLAN-tagged-interface-if-vlan_id-exists-in-pr.patch @@ -1,56 +1,17 @@ -From 8a84e41f0725d86f3e1f833546d52887cc82cffa Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Wed, 9 Nov 2022 16:36:15 +0000 +From abf80ccf177439e1eaf7930dce5c574549591deb Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 18:38:00 -0700 Subject: [PATCH] Create VLAN tagged interface if vlan_id= exists in - /proc/cmdline: + /proc/cmdline -This enables a vlan tagged machine to boot properly. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/go.mod | 1 + - actions/writefile/v1/go.sum | 4 ++ - actions/writefile/v1/main.go | 127 +++++++++++++++++++++++++++++------ - 3 files changed, 112 insertions(+), 20 deletions(-) + writefile/main.go | 127 ++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 107 insertions(+), 20 deletions(-) -diff --git a/actions/writefile/v1/go.mod b/actions/writefile/v1/go.mod -index 374846c..399c5a3 100644 ---- a/actions/writefile/v1/go.mod -+++ b/actions/writefile/v1/go.mod -@@ -7,6 +7,7 @@ require ( - github.com/kr/text v0.2.0 // indirect - github.com/sirupsen/logrus v1.7.0 - github.com/stretchr/testify v1.7.0 // indirect -+ github.com/vishvananda/netlink v1.1.0 // indirect - github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect -diff --git a/actions/writefile/v1/go.sum b/actions/writefile/v1/go.sum -index 3909e4b..15d11a9 100644 ---- a/actions/writefile/v1/go.sum -+++ b/actions/writefile/v1/go.sum -@@ -47,6 +47,9 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc - github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA= - github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= -+github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= -+github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= - github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg= - github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -@@ -67,6 +70,7 @@ golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index cfd9974..339dedd 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go +diff --git a/writefile/main.go b/writefile/main.go +index 8850e49..fa3c673 100644 +--- a/writefile/main.go ++++ b/writefile/main.go @@ -23,6 +23,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" "github.com/insomniacslk/dhcp/dhcpv4/nclient4" @@ -103,7 +64,7 @@ index cfd9974..339dedd 100644 -func dhcpAndWriteNetplan(ifname string, dhcpTimeout time.Duration) (string, error) { +func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { -+ cmdline, err := ioutil.ReadFile(f) ++ cmdline, err := os.ReadFile(f) + if err != nil { + return "", "", fmt.Errorf("failed to read /proc/cmdline: %w", err) + } @@ -221,5 +182,5 @@ index cfd9974..339dedd 100644 + return strconv.Atoi(parsed[1]) +} -- -2.34.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0006-Add-static-IP-configuration-for-Bottlerocket.patch b/projects/tinkerbell/hub/patches/0006-Add-static-IP-configuration-for-Bottlerocket.patch index 5153454d1f..8c1829c5c6 100644 --- a/projects/tinkerbell/hub/patches/0006-Add-static-IP-configuration-for-Bottlerocket.patch +++ b/projects/tinkerbell/hub/patches/0006-Add-static-IP-configuration-for-Bottlerocket.patch @@ -1,19 +1,16 @@ -From decdec5c435935fcb1365872bea492e40257ebc3 Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Thu, 8 Dec 2022 19:35:32 -0700 -Subject: [PATCH] Add static IP configuration for Bottlerocket: +From c61789b2dcee89bba0d76b88ecdfd7b0b2c2f217 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 18:48:20 -0700 +Subject: [PATCH] Add static IP configuration for Bottlerocket -Static IPs provide more reliable IP handling. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/main.go | 127 ++++++++++++++++++++++++++++------- - 1 file changed, 102 insertions(+), 25 deletions(-) + writefile/main.go | 128 +++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 103 insertions(+), 25 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 339dedd..d2a5ff2 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go +diff --git a/writefile/main.go b/writefile/main.go +index fa3c673..908b9fc 100644 +--- a/writefile/main.go ++++ b/writefile/main.go @@ -31,6 +31,7 @@ const ( mountAction = "/mountAction" bootConfigAction = "/usr/bin/bootconfig" @@ -70,7 +67,7 @@ index 339dedd..d2a5ff2 100644 func main() { fmt.Printf("WriteFile - Write file to disk\n------------------------\n") -@@ -69,23 +109,6 @@ func main() { +@@ -69,23 +109,7 @@ func main() { log.Errorf("Invalid DHCP_TIMEOUT: %s, using default: %v", t, timeout) } } @@ -91,10 +88,11 @@ index 339dedd..d2a5ff2 100644 - via: {{ ToString .Gateway }} - {{- end }} -` ++ if name, template, err := vlanEnabled("/proc/cmdline"); err == nil { netplanTemplate = template ifname = name -@@ -117,8 +140,8 @@ func main() { +@@ -117,8 +141,8 @@ func main() { validationCount++ } } @@ -105,7 +103,7 @@ index 339dedd..d2a5ff2 100644 } fileMode := os.FileMode(modePrime) -@@ -199,6 +222,38 @@ func main() { +@@ -199,6 +223,38 @@ func main() { } } @@ -144,7 +142,7 @@ index 339dedd..d2a5ff2 100644 // If bootconfig is set, contents will be empty and will serve as output initrd file provided // to bootconfig tool fqFilePath := filepath.Join(mountAction, filePath) -@@ -231,6 +286,19 @@ func main() { +@@ -231,6 +287,19 @@ func main() { log.Infof("Successfully wrote file [%s] to device [%s]", filePath, blockDevice) } @@ -164,7 +162,7 @@ index 339dedd..d2a5ff2 100644 func determineNetIF() string { runtime.LockOSThread() defer runtime.UnlockOSThread() -@@ -404,7 +472,7 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { +@@ -404,7 +473,7 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { return ifname, netplanTemplate, nil } @@ -173,7 +171,7 @@ index 339dedd..d2a5ff2 100644 // After locking a goroutine to its current OS thread with runtime.LockOSThread() // and changing its network namespace, any new subsequent goroutine won't be scheduled // on that thread while it's locked. Therefore, the new goroutine will run in a -@@ -418,22 +486,31 @@ func dhcpAndWriteNetplan(ifname string, dhcpTimeout time.Duration, netplanTempla +@@ -418,22 +487,31 @@ func dhcpAndWriteNetplan(ifname string, dhcpTimeout time.Duration, netplanTempla // Change to PID 1 network namespace so we can do a DHCP using the host's interface. ns1, err := netns.GetFromPid(1) if err != nil { @@ -208,7 +206,7 @@ index 339dedd..d2a5ff2 100644 } func netIPToString(ip []net.IP, sep string) string { -@@ -457,8 +534,8 @@ func netToString(v interface{}) string { +@@ -457,8 +535,8 @@ func netToString(v interface{}) string { return fmt.Sprintf("%v", v) } @@ -220,5 +218,5 @@ index 339dedd..d2a5ff2 100644 return "", err } -- -2.34.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0007-Update-vlan-checking.patch b/projects/tinkerbell/hub/patches/0007-Update-vlan-checking.patch index 4c25304843..72c6c2540b 100644 --- a/projects/tinkerbell/hub/patches/0007-Update-vlan-checking.patch +++ b/projects/tinkerbell/hub/patches/0007-Update-vlan-checking.patch @@ -1,20 +1,16 @@ -From 79e91b25c1ee99611f4f40f84cab34e92e3467c3 Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Wed, 25 Jan 2023 21:03:49 -0700 -Subject: [PATCH] Update vlan checking: +From dfe4e72b0402b43519e4c5f7b177a76aa1b5adc1 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 23:24:00 -0700 +Subject: [PATCH] Update vlan checking -Hook creates the vlan interface so we don't need -to create it here. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/main.go | 41 ++++++++---------------------------- - 1 file changed, 9 insertions(+), 32 deletions(-) + writefile/main.go | 40 +++++++++------------------------------- + 1 file changed, 9 insertions(+), 31 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index d2a5ff2..018c2a7 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go +diff --git a/writefile/main.go b/writefile/main.go +index 908b9fc..ef001c7 100644 +--- a/writefile/main.go ++++ b/writefile/main.go @@ -14,6 +14,7 @@ import ( "os/exec" "path" @@ -31,10 +27,10 @@ index d2a5ff2..018c2a7 100644 "github.com/vishvananda/netns" ) -@@ -109,9 +109,9 @@ func main() { - log.Errorf("Invalid DHCP_TIMEOUT: %s, using default: %v", t, timeout) +@@ -110,9 +110,9 @@ func main() { } } + - if name, template, err := vlanEnabled("/proc/cmdline"); err == nil { + if n, template, err := vlanEnabled("/proc/cmdline"); err == nil { netplanTemplate = template @@ -43,11 +39,11 @@ index d2a5ff2..018c2a7 100644 } contents, err = dhcpAndWriteNetplan(ifname, timeout, netplanTemplate) if err != nil { -@@ -415,36 +415,13 @@ func ensureDir(mountPath, path string, mode os.FileMode, uid, gid int) error { +@@ -416,34 +416,12 @@ func ensureDir(mountPath, path string, mode os.FileMode, uid, gid int) error { } func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { -- cmdline, err := ioutil.ReadFile(f) +- cmdline, err := os.ReadFile(f) - if err != nil { - return "", "", fmt.Errorf("failed to read /proc/cmdline: %w", err) - } @@ -82,10 +78,8 @@ index d2a5ff2..018c2a7 100644 + if match, err := regexp.MatchString(exp, ifname); err != nil || !match { + return "", "", fmt.Errorf("failed to match interface name %s with regex %s: %w", ifname, exp, err) } -- + netplanTemplate = `network: - version: 2 - renderer: networkd -- -2.34.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0008-Fix-netplan-vlan-file.patch b/projects/tinkerbell/hub/patches/0008-Fix-netplan-vlan-file.patch index a06febe5c0..6c66c14de0 100644 --- a/projects/tinkerbell/hub/patches/0008-Fix-netplan-vlan-file.patch +++ b/projects/tinkerbell/hub/patches/0008-Fix-netplan-vlan-file.patch @@ -1,20 +1,17 @@ -From 54e157d9565bf868079920a2b427f289df4be85a Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Fri, 27 Jan 2023 12:26:17 -0700 -Subject: [PATCH] Fix netplan vlan file: +From 0ffaf7a051de7cf13957cc98015386378424ab02 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 23:27:02 -0700 +Subject: [PATCH] Fix netplan vlan file -Formatting was bad and caused netplan to fail. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/main.go | 40 +++++++++++++++++++----------------- + writefile/main.go | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 018c2a7..07e816a 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -418,7 +418,7 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { +diff --git a/writefile/main.go b/writefile/main.go +index ef001c7..4648135 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -419,7 +419,7 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { ifname = determineNetIF() // want "eth0.X", where X is between 1 and 4096 // This interface will exist if Hook creates it. Hook will create it if "vlan_id" is set in /proc/cmdline. @@ -23,7 +20,7 @@ index 018c2a7..07e816a 100644 if match, err := regexp.MatchString(exp, ifname); err != nil || !match { return "", "", fmt.Errorf("failed to match interface name %s with regex %s: %w", ifname, exp, err) } -@@ -431,19 +431,19 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { +@@ -433,19 +433,19 @@ func vlanEnabled(f string) (ifname, netplanTemplate string, err error) { macaddress: {{ .HWAddr }} set-name: mainif @@ -56,7 +53,7 @@ index 018c2a7..07e816a 100644 ` return ifname, netplanTemplate, nil -@@ -544,11 +544,13 @@ func translate(d *dhcpv4.DHCPv4) Info { +@@ -546,11 +546,13 @@ func translate(d *dhcpv4.DHCPv4) Info { info.IPAddr = net.IPNet{IP: d.YourIPAddr, Mask: d.SubnetMask()} info.Gateway = d.GetOneOption(dhcpv4.OptionRouter) info.Nameservers = d.DNS() @@ -65,7 +62,7 @@ index 018c2a7..07e816a 100644 - s := o.Get(dhcpv4.GenericOptionCode(116)) - if vlan, err := strconv.Atoi(string(s)); err == nil { - info.VLANID = vlan -+ s, err := ioutil.ReadFile("/proc/cmdline") ++ s, err := os.ReadFile("/proc/cmdline") + if err != nil { + fmt.Println("failed to read /proc/cmdline while looking for vlan_id=: ", err) + return info @@ -76,5 +73,5 @@ index 018c2a7..07e816a 100644 return info -- -2.34.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0009-Use-MAC-address-in-Bottlerocket-network-config.patch b/projects/tinkerbell/hub/patches/0009-Use-MAC-address-in-Bottlerocket-network-config.patch index c1121d082e..733da087f7 100644 --- a/projects/tinkerbell/hub/patches/0009-Use-MAC-address-in-Bottlerocket-network-config.patch +++ b/projects/tinkerbell/hub/patches/0009-Use-MAC-address-in-Bottlerocket-network-config.patch @@ -1,22 +1,16 @@ -From a5d8410a200c7dd52714b511c9e39748c5391dc5 Mon Sep 17 00:00:00 2001 +From dcb58b3c5c7df08e861c14cb32f1a57c5060541d Mon Sep 17 00:00:00 2001 From: Prow Bot -Date: Thu, 18 May 2023 22:47:28 -0600 -Subject: [PATCH] Use MAC address in Bottlerocket network config: +Date: Tue, 16 Apr 2024 23:28:41 -0700 +Subject: [PATCH] Use MAC address in Bottlerocket network config -Since Bottlerocket v1.11.0 we can use the MAC -address to define the network config. This will -make the network config more flexible across -hardware. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/main.go | 8 ++++---- + writefile/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 07e816a..db393fe 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go +diff --git a/writefile/main.go b/writefile/main.go +index 4648135..ffcdce9 100644 +--- a/writefile/main.go ++++ b/writefile/main.go @@ -45,12 +45,12 @@ type Info struct { var bottlerocketNetTOMLTemplate = `# Version is required, it will change as we support @@ -33,7 +27,7 @@ index 07e816a..db393fe 100644 to = "default" via = "{{ ToString .Gateway }}" route-metric = 100 -@@ -238,7 +238,7 @@ func main() { +@@ -239,7 +239,7 @@ func main() { log.Fatal(err, " IFName=", ifn) } i := translate(d) @@ -43,5 +37,5 @@ index 07e816a..db393fe 100644 if err != nil { log.Fatal(err) -- -2.39.2 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0010-Handle-non-200-status-codes-from-metadata-service.patch b/projects/tinkerbell/hub/patches/0010-Handle-non-200-status-codes-from-metadata-service.patch index a56956e7a7..81e567e529 100644 --- a/projects/tinkerbell/hub/patches/0010-Handle-non-200-status-codes-from-metadata-service.patch +++ b/projects/tinkerbell/hub/patches/0010-Handle-non-200-status-codes-from-metadata-service.patch @@ -1,17 +1,17 @@ -From 9935e57fc9fb02b2af061f1de7ea9976c1b6ab17 Mon Sep 17 00:00:00 2001 -From: Chris Doherty -Date: Fri, 23 Jun 2023 09:18:26 -0500 +From 6c119b6d998ae761aee5ad6cfb8acf0fc2e2fca2 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 23:29:54 -0700 Subject: [PATCH] Handle non-200 status codes from metadata service --- - actions/writefile/v1/main.go | 5 +++++ + writefile/main.go | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index db393fe..954a45e 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -205,6 +205,11 @@ func main() { +diff --git a/writefile/main.go b/writefile/main.go +index ffcdce9..312e608 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -206,6 +206,11 @@ func main() { } defer resp.Body.Close() @@ -20,9 +20,9 @@ index db393fe..954a45e 100644 + continue + } + - respBody, err := ioutil.ReadAll(resp.Body) + respBody, err := io.ReadAll(resp.Body) if err != nil { log.Warnf("Error reading HTTP GET response body: %v", err) -- -2.34.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0011-Ensure-content-is-specified-before-writing-file.patch b/projects/tinkerbell/hub/patches/0011-Ensure-content-is-specified-before-writing-file.patch index bf9632f7d9..6317a6896a 100644 --- a/projects/tinkerbell/hub/patches/0011-Ensure-content-is-specified-before-writing-file.patch +++ b/projects/tinkerbell/hub/patches/0011-Ensure-content-is-specified-before-writing-file.patch @@ -1,17 +1,17 @@ -From 5c7b24fde808e5c175df6ff9f1286b49a0f156a9 Mon Sep 17 00:00:00 2001 -From: Chris Doherty -Date: Tue, 15 Aug 2023 13:34:34 -0500 +From 307462cae2bc2e55801461ac697b8d7734ef6544 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 23:31:41 -0700 Subject: [PATCH] Ensure content is specified before writing file --- - actions/writefile/v1/main.go | 6 +++++- + writefile/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index 954a45e..bf9f4ac 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -259,6 +259,10 @@ func main() { +diff --git a/writefile/main.go b/writefile/main.go +index 312e608..82b7bbf 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -260,6 +260,10 @@ func main() { } } @@ -22,7 +22,7 @@ index 954a45e..bf9f4ac 100644 // If bootconfig is set, contents will be empty and will serve as output initrd file provided // to bootconfig tool fqFilePath := filepath.Join(mountAction, filePath) -@@ -292,7 +296,7 @@ func main() { +@@ -293,7 +297,7 @@ func main() { } func appendToUserData(contents string, filePath string) error { @@ -32,5 +32,5 @@ index 954a45e..bf9f4ac 100644 return err } -- -2.40.1 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0012-Allow-BOOTCONFIG_CONTENTS-and-CONTENTS-to-be-checked.patch b/projects/tinkerbell/hub/patches/0012-Allow-BOOTCONFIG_CONTENTS-and-CONTENTS-to-be-checked.patch index 9ad25384c3..f1cf155b0f 100644 --- a/projects/tinkerbell/hub/patches/0012-Allow-BOOTCONFIG_CONTENTS-and-CONTENTS-to-be-checked.patch +++ b/projects/tinkerbell/hub/patches/0012-Allow-BOOTCONFIG_CONTENTS-and-CONTENTS-to-be-checked.patch @@ -1,21 +1,17 @@ -From 1f42fd3edda7bd83a1b1770e6038c7c6d6de6ece Mon Sep 17 00:00:00 2001 +From 338af59d2cc38059d87dc5c091c943c7b7379191 Mon Sep 17 00:00:00 2001 From: Prow Bot -Date: Mon, 28 Aug 2023 11:05:36 -0600 -Subject: [PATCH] Allow BOOTCONFIG_CONTENTS and CONTENTS to be checked: +Date: Tue, 16 Apr 2024 23:32:47 -0700 +Subject: [PATCH] Allow BOOTCONFIG_CONTENTS and CONTENTS to be checked -Without this a Bottlerocket action that only -specifies BOOTCONFIG_CONTENTS will fail. - -Signed-off-by: Prow Bot --- - actions/writefile/v1/main.go | 4 ++-- + writefile/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index bf9f4ac..d5f923c 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -259,8 +259,8 @@ func main() { +diff --git a/writefile/main.go b/writefile/main.go +index 82b7bbf..5f4c6c0 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -260,8 +260,8 @@ func main() { } } @@ -27,5 +23,5 @@ index bf9f4ac..d5f923c 100644 // If bootconfig is set, contents will be empty and will serve as output initrd file provided -- -2.41.0 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0013-Fix-net-interface-lookup.patch b/projects/tinkerbell/hub/patches/0013-Fix-net-interface-lookup.patch index e83ef4e300..46fc4c8a52 100644 --- a/projects/tinkerbell/hub/patches/0013-Fix-net-interface-lookup.patch +++ b/projects/tinkerbell/hub/patches/0013-Fix-net-interface-lookup.patch @@ -1,27 +1,19 @@ -From f39ec645991b0e7585d34a00788b4546b8915a8b Mon Sep 17 00:00:00 2001 -From: Jacob Weinstock -Date: Tue, 17 Oct 2023 15:12:47 -0600 -Subject: [PATCH] Fix net interface lookup: +From 27f4857f2cadece51ef0e731f9a797b3de2d5ac3 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Tue, 16 Apr 2024 23:36:52 -0700 +Subject: [PATCH] Fix net interface lookup -We use the mac address in /proc/cmdline -to be sure we use the interface that is -known to the Tinkerbell stack. - -This fixes issues when multiple configured -interfaces are present. - -Signed-off-by: Jacob Weinstock --- - actions/writefile/v1/cmdline.go | 157 ++++++++++++++++++++++++++++++++ - actions/writefile/v1/main.go | 16 ++++ + writefile/cmdline.go | 157 +++++++++++++++++++++++++++++++++++++++++++ + writefile/main.go | 16 +++++ 2 files changed, 173 insertions(+) - create mode 100644 actions/writefile/v1/cmdline.go + create mode 100644 writefile/cmdline.go -diff --git a/actions/writefile/v1/cmdline.go b/actions/writefile/v1/cmdline.go +diff --git a/writefile/cmdline.go b/writefile/cmdline.go new file mode 100644 index 0000000..d80d5bd --- /dev/null -+++ b/actions/writefile/v1/cmdline.go ++++ b/writefile/cmdline.go @@ -0,0 +1,157 @@ +// Copyright 2018 the u-root Authors. All rights reserved +// Use of this source code is governed by a BSD-style @@ -180,11 +172,11 @@ index 0000000..d80d5bd + value, present := c.AsMap[canonicalFlag] + return value, present +} -diff --git a/actions/writefile/v1/main.go b/actions/writefile/v1/main.go -index d5f923c..d83867a 100644 ---- a/actions/writefile/v1/main.go -+++ b/actions/writefile/v1/main.go -@@ -308,6 +308,22 @@ func appendToUserData(contents string, filePath string) error { +diff --git a/writefile/main.go b/writefile/main.go +index 5f4c6c0..1537b2b 100644 +--- a/writefile/main.go ++++ b/writefile/main.go +@@ -309,6 +309,22 @@ func appendToUserData(contents string, filePath string) error { return nil } @@ -208,5 +200,5 @@ index d5f923c..d83867a 100644 runtime.LockOSThread() defer runtime.UnlockOSThread() -- -2.42.0 +2.40.0 diff --git a/projects/tinkerbell/hub/patches/0014-Update-go.mod-and-go.sum.patch b/projects/tinkerbell/hub/patches/0014-Update-go.mod-and-go.sum.patch new file mode 100644 index 0000000000..252159f514 --- /dev/null +++ b/projects/tinkerbell/hub/patches/0014-Update-go.mod-and-go.sum.patch @@ -0,0 +1,185 @@ +From a5ffe0043d9beff34e5d7e1e3cc923e190bdf614 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Wed, 17 Apr 2024 10:06:53 -0700 +Subject: [PATCH] Update go.mod and go.sum + +--- + go.mod | 13 ++++++++++--- + go.sum | 40 ++++++++++++++++++++++++++++++++-------- + 2 files changed, 42 insertions(+), 11 deletions(-) + +diff --git a/go.mod b/go.mod +index acf9299..b0a8b52 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,13 +7,15 @@ require ( + github.com/deislabs/oras v0.11.1 + github.com/diskfs/go-diskfs v1.1.1 + github.com/dustin/go-humanize v1.0.0 ++ github.com/insomniacslk/dhcp v0.0.0-20240227161007-c728f5dd21c8 + github.com/klauspost/compress v1.17.7 + github.com/opencontainers/go-digest v1.0.0 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.9.0 + github.com/spf13/cobra v1.1.3 + github.com/ulikunitz/xz v0.5.11 +- golang.org/x/sys v0.5.0 ++ github.com/vishvananda/netns v0.0.4 ++ golang.org/x/sys v0.13.0 + ) + + require ( +@@ -25,11 +27,16 @@ require ( + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/golang-lru v0.5.1 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect ++ github.com/josharian/native v1.1.0 // indirect ++ github.com/mdlayher/packet v1.1.2 // indirect ++ github.com/mdlayher/socket v0.4.1 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect ++ github.com/pierrec/lz4/v4 v4.1.14 // indirect + github.com/spf13/pflag v1.0.5 // indirect ++ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect + go.opencensus.io v0.22.0 // indirect +- golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect +- golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect ++ golang.org/x/net v0.17.0 // indirect ++ golang.org/x/sync v0.3.0 // indirect + google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect + google.golang.org/grpc v1.23.1 // indirect + gopkg.in/djherbis/times.v1 v1.3.0 // indirect +diff --git a/go.sum b/go.sum +index 4570f76..9e0c5e8 100644 +--- a/go.sum ++++ b/go.sum +@@ -125,8 +125,9 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z + github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= + github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= + github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= + github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= ++github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= ++github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= + github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= + github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= + github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +@@ -166,11 +167,18 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO + github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= + github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= + github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= ++github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714 h1:/jC7qQFrv8CrSJVmaolDVOxTfS9kc36uB6H40kdbQq8= ++github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= + github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= + github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= ++github.com/insomniacslk/dhcp v0.0.0-20240227161007-c728f5dd21c8 h1:V3plQrMHRWOB5zMm3yNqvBxDQVW1+/wHBSok5uPdmVs= ++github.com/insomniacslk/dhcp v0.0.0-20240227161007-c728f5dd21c8/go.mod h1:izxuNQZeFrbx2nK2fAyN5iNUB34Fe9j0nK4PwLzAkKw= + github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= + github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= + github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= ++github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= ++github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= ++github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= + github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= + github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= + github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +@@ -193,6 +201,10 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO + github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= + github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= + github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= ++github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY= ++github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4= ++github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= ++github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= + github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= + github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= + github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +@@ -223,6 +235,8 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI + github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= + github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= + github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= ++github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= ++github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +@@ -287,9 +301,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc + github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= + github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= ++github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA= ++github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= + github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= + github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= + github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= ++github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= ++github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= + github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= + github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= + github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +@@ -309,8 +327,9 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf + 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= +-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= + golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= ++golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= ++golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= + golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= + golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= + golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +@@ -345,8 +364,9 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn + golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= + golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= ++golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +@@ -355,8 +375,9 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ + golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= ++golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= + golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +@@ -379,14 +400,16 @@ golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= ++golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= + 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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= ++golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= ++golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= + 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/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +@@ -455,8 +478,9 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= + gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= + gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= + gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= ++gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= ++gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= + gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= + gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +-- +2.40.0 +