Bump tinkerbell/hook to v0.8.1 (#3108)

aws · Apr 23, 2024 · ef4aaae · ef4aaae
1 parent 237fd96
commit ef4aaae
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 122 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -273,8 +273,8 @@ projects:
             go_version: "1.21"
       - name: hook
         versions:
-          - commit: 9d54933a03f2f4c06322969b06caa18702d17f66
-            go_version: "1.17"
+          - tag: v0.8.1
+            go_version: "1.20"
       - name: hub
         versions:
           - commit: 404dab73a8a7f33e973c6e71782f07e82b125da9

diff --git a/projects/tinkerbell/hook/CHECKSUMS b/projects/tinkerbell/hook/CHECKSUMS
@@ -1,4 +1,4 @@
-1a0b5288118c9fc24e7e725356feabfbd16ea6d42711bda36b790afb76040a2f  _output/bin/hook/linux-amd64/hook-bootkit
-edf47abbf9e9927fbe08ef6756cbae7749c17271860abb65f06b7a44274e06d8  _output/bin/hook/linux-amd64/hook-docker
-fd6a1e499d6d614453befa7bcbd2e55c877bd401cfb4138d2de7141638d7fb4c  _output/bin/hook/linux-arm64/hook-bootkit
-5378921b8600da22c33de603891102727cea7f20ac80e443fd26cf775f54d9c2  _output/bin/hook/linux-arm64/hook-docker
+e3c1b8fef2ca85180d9b3dc58037925d0708ec52d9e0553342d75f8bbe8713e7  _output/bin/hook/linux-amd64/hook-bootkit
+e1d9e144686d542654568336b790d9249fd3087f801b4c5f6e4a457e21cc46e6  _output/bin/hook/linux-amd64/hook-docker
+c8ee13c4ef537c866cd5b4b0cf8acbb92845aaeda7580c0fdaf3e8c82966b062  _output/bin/hook/linux-arm64/hook-bootkit
+31b5698bd73a1441b287b4b2e3970bd0be80486a04d2cbeb8521b674b7343248  _output/bin/hook/linux-arm64/hook-docker
diff --git a/projects/tinkerbell/hook/GIT_TAG b/projects/tinkerbell/hook/GIT_TAG
@@ -1 +1 @@
-9d54933a03f2f4c06322969b06caa18702d17f66
+v0.8.1
diff --git a/projects/tinkerbell/hook/GOLANG_VERSION b/projects/tinkerbell/hook/GOLANG_VERSION
@@ -1 +1 @@
-1.17
+1.20
diff --git a/projects/tinkerbell/hook/HOOK_BOOTKIT_ATTRIBUTION.txt b/projects/tinkerbell/hook/HOOK_BOOTKIT_ATTRIBUTION.txt
@@ -1,34 +1,25 @@
 
-** github.com/containerd/containerd; version v1.4.3 --
-https://github.com/containerd/containerd
-
-** github.com/docker/distribution; version v2.7.1+incompatible --
+** github.com/docker/distribution; version v2.8.2+incompatible --
 https://github.com/distribution/distribution
 
-** github.com/docker/docker; version v20.10.2+incompatible --
+** github.com/docker/docker; version v24.0.4+incompatible --
 https://github.com/moby/moby
 
 ** github.com/docker/go-connections; version v0.4.0 --
 https://github.com/docker/go-connections
 
-** github.com/docker/go-units; version v0.4.0 --
+** github.com/docker/go-units; version v0.5.0 --
 https://github.com/docker/go-units
 
 ** 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 --
+** github.com/opencontainers/image-spec/specs-go; version v1.0.2 --
 https://github.com/opencontainers/image-spec
 
-** github.com/tinkerbell/hook/hook-bootkit; version 9d54933a03f2f4c06322969b06caa18702d17f66 --
+** github.com/tinkerbell/hook/hook-bootkit; version v0.8.1 --
 https://github.com/tinkerbell/hook/hook-bootkit
 
-** google.golang.org/genproto/googleapis/rpc/status; version v0.0.0-20200526211855-cb27e3aa2013 --
-https://github.com/googleapis/go-genproto
-
-** google.golang.org/grpc; version v1.34.0 --
-https://github.com/grpc/grpc-go
-
 
                                  Apache License
                            Version 2.0, January 2004
@@ -233,25 +224,6 @@ https://github.com/grpc/grpc-go
    limitations under the License.
 
 
-* For github.com/containerd/containerd see also this required NOTICE:
-Docker
-Copyright 2012-2015 Docker, Inc.
-
-This product includes software developed at Docker, Inc. (https://www.docker.com).
-
-The following is courtesy of our legal counsel:
-
-
-Use and transfer of Docker may be subject to certain restrictions by the
-United States and other governments.
-It is your responsibility to ensure that your use and/or transfer does not
-violate applicable laws.
-
-For more information, please see https://www.bis.doc.gov
-
-See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
-
-
 * For github.com/docker/docker see also this required NOTICE:
 Docker
 Copyright 2012-2017 Docker, Inc.
@@ -345,49 +317,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** github.com/golang/protobuf; version v1.4.2 --
-https://github.com/golang/protobuf
-
-Copyright 2010 The Go Authors.  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.
-
-
-------
-
-** golang.org/go; version go1.17.13 --
+** golang.org/go; version go1.20.14 --
 https://github.com/golang/go
 
-** golang.org/x/net; version v0.0.0-20201021035429-f5854403a974 --
+** golang.org/x/net; version v0.12.0 --
 https://golang.org/x/net
 
-** golang.org/x/sys; version v0.0.0-20210616094352-59db8d763f22 --
-https://golang.org/x/sys
-
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -418,47 +353,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** google.golang.org/protobuf; version v1.25.0 --
-https://go.googlesource.com/protobuf
-
-Copyright (c) 2018 The Go Authors. 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/cenkalti/backoff/v4; version v4.1.3 --
+** github.com/cenkalti/backoff/v4; version v4.2.1 --
 https://github.com/cenkalti/backoff/v4
 Copyright (c) 2014 Cenk Altı
 
-** github.com/sirupsen/logrus; version v1.7.0 --
-https://github.com/sirupsen/logrus
-Copyright (c) 2014 Simon Eskildsen
-
 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

diff --git a/projects/tinkerbell/hook/HOOK_DOCKER_ATTRIBUTION.txt b/projects/tinkerbell/hook/HOOK_DOCKER_ATTRIBUTION.txt
@@ -1,5 +1,5 @@
 
-** github.com/tinkerbell/hook/hook-docker; version 9d54933a03f2f4c06322969b06caa18702d17f66 --
+** github.com/tinkerbell/hook/hook-docker; version v0.8.1 --
 https://github.com/tinkerbell/hook/hook-docker
 
 
@@ -207,7 +207,7 @@ https://github.com/tinkerbell/hook/hook-docker
 
 ------
 
-** golang.org/go; version go1.17.13 --
+** golang.org/go; version go1.20.14 --
 https://github.com/golang/go
 
 Copyright (c) 2009 The Go Authors. All rights reserved.

diff --git a/projects/tinkerbell/hook/Makefile b/projects/tinkerbell/hook/Makefile
@@ -25,7 +25,6 @@ CREATE_HOOK_FILES=$(REPO)/out/sha-6d43b8b/rel/vmlinuz-x86_64
 
 HAS_S3_ARTIFACTS=true
 SIMPLE_CREATE_TARBALLS=false
-EXCLUDE_FROM_UPGRADE_BUILDSPEC=true
 
 FIX_LICENSES_HOOK_BOOTKIT_TARGET=$(REPO)/hook-bootkit/LICENSE
 FIX_LICENSES_HOOK_DOCKER_TARGET=$(REPO)/hook-docker/LICENSE

diff --git a/projects/tinkerbell/hook/README.md b/projects/tinkerbell/hook/README.md
@@ -1,5 +1,5 @@
 ## **Hook**
-![Version](https://img.shields.io/badge/version-9d54933a03f2f4c06322969b06caa18702d17f66-blue)
+![Version](https://img.shields.io/badge/version-v0.8.1-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicVVYYXpIMzRpazNGUTBWdnY1dittK09zNDJvRmtlUlpTZUtZRFoyMkZ0YzlZT3NBMTRSSUFacFg3ZzdVNjg3SlhOZ2dZNmExOVkwaDE5U2RNQldWSTBzPSIsIml2UGFyYW1ldGVyU3BlYyI6ImdYN1lEaGZuSVpQMjhLM2EiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 [Hook](https://github.com/tinkerbell/hook) is the Tinkerbell Installation Environment for bare-metal. It runs in-memory, installs operating system, and handles deprovisioning.

diff --git a/tools/version-tracker/buildspecs/upgrade.yml b/tools/version-tracker/buildspecs/upgrade.yml
@@ -507,6 +507,13 @@ batch:
         variables:
           PROJECT_PATH: projects/tinkerbell/hegel
           CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.hegel
+    - identifier: tinkerbell_hook
+      env:
+        type: ARM_CONTAINER
+        compute-type: BUILD_GENERAL1_SMALL
+        variables:
+          PROJECT_PATH: projects/tinkerbell/hook
+          CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.hook
     - identifier: tinkerbell_rufio
       env:
         type: ARM_CONTAINER
@@ -596,6 +603,7 @@ batch:
         - rancher_local_path_provisioner
         - replicatedhq_troubleshoot
         - tinkerbell_hegel
+        - tinkerbell_hook
         - tinkerbell_rufio
         - tinkerbell_tink
         - vmware_govmomi