Merge pull request #885 from ecpullen/update-eksctl

tools: eksctl to 0.169.0, helm to 3.14.0

Makefile

@@ -5,7 +5,7 @@
 TOP := $(dir $(firstword $(MAKEFILE_LIST)))
 
 # Variables we update as newer versions are released
-BOTTLEROCKET_SDK_VERSION = v0.34.1
+BOTTLEROCKET_SDK_VERSION = v0.37.0
 BOTTLEROCKET_SDK_ARCH = $(TESTSYS_BUILD_HOST_UNAME_ARCH)
 BOTTLEROCKET_TOOLS_VERSION ?= v0.7.0
 

deny.toml

@@ -19,8 +19,8 @@ allow = [
     "ISC",
     "MIT",
     "OpenSSL",
-    "Unicode-DFS-2016"
-    #"Unlicense",
+    "Unicode-DFS-2016",
+    "Unlicense",
     #"Zlib"
 ]
 

tools/Dockerfile

@@ -6,6 +6,7 @@ FROM "${BUILDER_IMAGE}" as base
 USER root
 COPY ./hashes /hashes
 COPY ./clarify.toml /clarify.toml
+COPY ./eksctl.clarify.toml /eksctl.clarify.toml
 
 # =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=
 # Shared build stage used to build Go binaries.
@@ -27,10 +28,10 @@ USER root
 RUN mkdir -p /usr/share/licenses/eksctl && \
     chown -R builder:builder /usr/share/licenses/eksctl
 
-ARG EKSCTL_VERSION=0.144.0
-ARG EKSCTL_SOURCE_URL="https://github.com/weaveworks/eksctl/archive/refs/tags/v${EKSCTL_VERSION}.tar.gz"
+ARG EKSCTL_VERSION=0.169.0
+ARG EKSCTL_SOURCE_URL="https://github.com/eksctl-io/eksctl/archive/refs/tags/v${EKSCTL_VERSION}.tar.gz"
 
-ARG EKSCTL_BINARY_URL="https://github.com/weaveworks/eksctl/releases/download/v${EKSCTL_VERSION}/eksctl_Linux_${GOARCH}.tar.gz"
+ARG EKSCTL_BINARY_URL="https://github.com/eksctl-io/eksctl/releases/download/v${EKSCTL_VERSION}/eksctl_Linux_${GOARCH}.tar.gz"
 
 USER builder
 WORKDIR /home/builder/
@@ -47,7 +48,7 @@ WORKDIR /home/builder/eksctl/
 RUN go mod vendor
 RUN cp -p LICENSE /usr/share/licenses/eksctl && \
     /usr/libexec/tools/bottlerocket-license-scan \
-      --clarify /clarify.toml \
+      --clarify /eksctl.clarify.toml \
       --spdx-data /usr/libexec/tools/spdx-data \
       --out-dir /usr/share/licenses/eksctl/vendor \
       go-vendor ./vendor
@@ -147,7 +148,7 @@ USER root
 RUN mkdir -p /usr/share/licenses/helm && \
     chown -R builder:builder /usr/share/licenses/helm
 
-ARG HELM_VERSION=3.8.2
+ARG HELM_VERSION=3.14.0
 ARG HELM_SOURCE_URL="https://github.com/helm/helm/archive/refs/tags/v${HELM_VERSION}.tar.gz"
 
 # ARG HELM_BINARY_URL="https://github.com/helm/helm/releases/download/v${HELM_VERSION}/helm-v${HELM_VERSION}-${GOOS}-${GOARCH}.tar.gz.asc"

tools/clarify.toml

@@ -59,7 +59,7 @@ license-files = [
 expression = "BSD-3-Clause"
 license-files = [
     { path = "COPYRIGHT", hash = 0xe41dd36c },
-    { path = "LICENSE", hash = 0xfc8f12ff },
+    { path = "LICENSE", hash = 0xbd510d7b },
 ]
 
 [clarify."github.com/sanathkr/yaml"]
@@ -105,7 +105,7 @@ license-files = [
     { path = "go/ir/LICENSE", hash = 0xe656fb62 },
 ]
 
-[clarify."sigs.k8s.io/yaml"]
+[[clarify."sigs.k8s.io/yaml"]]
 expression = "MIT AND BSD-3-Clause"
 license-files = [
     { path = "LICENSE", hash = 0xcdf3ae00 },

tools/eksctl.clarify.toml

@@ -0,0 +1,138 @@
+[clarify."github.com/caarlos0/go-reddit/v3"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x709001e3 },
+]
+
+[clarify."github.com/dave/dst"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x8f288482},
+]
+
+[clarify."github.com/JeffAshton/win_pdh"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0xb221dcc9 },
+]
+
+[clarify."github.com/daviddengcn/go-colortext"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x9769fae1 },
+]
+
+[clarify."github.com/fatih/structtag"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x47b38429 },
+]
+
+[clarify."github.com/ghodss/yaml"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0xcdf3ae00 },
+]
+
+[clarify."github.com/go-bindata/go-bindata"]
+expression = "CC0-1.0"
+license-files = [
+    { path = "LICENSE", hash = 0x393fafd6 },
+]
+
+[clarify."github.com/golangci/go-misc"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x14727692 },
+]
+
+[clarify."github.com/heketi/heketi"]
+expression = "(Apache-2.0 OR LGPL-3.0-or-later) AND (LGPL-3.0-or-later OR GPL-2.0)"
+license-files = [
+    { path = "COPYING-GPLV2", hash = 0xeaa66bfd },
+    { path = "COPYING-LGPLV3", hash = 0xf0bccb3a },
+    { path = "LICENSE", hash = 0x3c4b96d1 },
+    { path = "LICENSE-APACHE2", hash = 0x438c8616 },
+]
+
+[clarify."github.com/miekg/dns"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "COPYRIGHT", hash = 0xe41dd36c },
+    { path = "LICENSE", hash = 0xbd510d7b },
+]
+
+[clarify."github.com/sanathkr/yaml"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0xcdf3ae00 },
+]
+
+[clarify."github.com/storageos/go-api"]
+expression = "MIT"
+license-files = [
+    { path = "LICENCE", hash = 0x67a6861e },
+]
+skip-files = [
+    "licence.go",
+    "types/licence.go",
+]
+
+[clarify."github.com/vartanbeno/go-reddit/v2"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x709001e3 },
+]
+
+[clarify."github.com/DATA-DOG/go-sqlmock"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0x399e7e6f },
+]
+
+[clarify."gopkg.in/yaml.v1"]
+expression = "MIT AND Apache-2.0"
+license-files = [
+    { path = "LICENSE", hash = 0x9c545105 },
+    { path = "LICENSE.libyaml", hash = 0xa2e4ce3 },
+]
+
+[clarify."honnef.co/go/tools"]
+expression = "MIT AND BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0xad378ed2 },
+    { path = "LICENSE-THIRD-PARTY", hash = 0xac406a4d },
+    { path = "go/ir/LICENSE", hash = 0xe656fb62 },
+]
+
+
+[[clarify."sigs.k8s.io/yaml"]]
+expression = "MIT"
+license-files = [
+    { path = "LICENSE", hash = 0x617d80bc },
+    { path = "goyaml.v2/LICENSE", hash =0xe569d630 },
+    { path = "goyaml.v2/LICENSE.libyaml", hash = 0xa2e4ce3},
+    { path = "goyaml.v2/NOTICE", hash = 0x49bceeb9},
+]
+
+[clarify."github.com/cloudflare/circl"]
+expression = "BSD-3-Clause"
+license-files = [
+    { path = "LICENSE", hash = 0xc5e27124 },
+]
+
+[clarify."github.com/alecthomas/go-check-sumtype"]
+expression = "MIT OR Unlicense"
+license-files = [
+    { path = "LICENSE-MIT", hash = 0x616d8a83 },
+    { path = "COPYING", hash = 0x969f37d8},
+    { path = "UNLICENSE", hash = 0x87b84020}
+]
+
+[clarify."github.com/goreleaser/goreleaser"]
+expression = "MIT"
+license-files = [
+    { path = "LICENSE.md", hash = 0x311e36ad },
+    { path = "EULA.md", hash = 0x7788bbb1 },
+]
+

tools/hashes/eksctl

@@ -1,3 +1,3 @@
-7c66920dfa6339f6d0c7d2338ff35399c13c20bf1d86b1c43d3f3c11ee682afe7b00ba6b22b9f6d133c86d4b2eda24e4c0bfdb5ea47360752f7a4216c2cb6872  eksctl_0.144.0_linux_amd64.tar.gz
-728d658698808c46a1c6edaf39d3341a96393c07e9462fe1269a0a593b519700b57a6410196bd3122e8d298b21988e3972d86676bc5ac722622ee05cbdba23a6  eksctl_0.144.0.tar.gz
-6cbe32b3feb0f603865d0feac4ac0d37f96901aa0323c539ea76a652bbae063002bba1feae497a76bffd6a7c7dc191f7c992e340cf258437b3739816c068103c  eksctl_0.144.0_linux_arm64.tar.gz
+245b9919e8d74e339eb7fe439cf3fb39c5b86eef3c99c89c83905e97878bdc2d13331f2355d9dcceab3070ac4fdc672f641c51795325ebbf672a839b664a3763  eksctl_0.169.0_linux_amd64.tar.gz
+245b9919e8d74e339eb7fe439cf3fb39c5b86eef3c99c89c83905e97878bdc2d13331f2355d9dcceab3070ac4fdc672f641c51795325ebbf672a839b664a3763  eksctl_0.169.0_linux_arm64.tar.gz
+f6943aeebf114e00293f027712652712a949f18a9673eeadeb9f9f3d197b0a9b5b0942930d4ecc2809ba796e878e71c64979e2a8231be558bcebf6cf1b967d92  eksctl_0.169.0.tar.gz

tools/hashes/helm

@@ -1,3 +1,3 @@
-cb69548fcb9c131ac21c3872b1974ff591142e28470ca3691e0d1f9398fb45d5af5911baf36b5b94b444c625e1369228760bb396417176d7a6ee0b375a9569de  helm_3.8.2.tar.gz
-3ecf0809c570a5eba74298d7638d310746cc2435176480efaa94b0e6023b64a308444419a05a1e321b4c50cae8a53157e725e1a03a7326959f23309ff61a2edc  helm_3.8.2_linux_amd64.tar.gz
-604832931c406da215d2f9d2064ee3e4cc91b5e664c404692aeb6600300e82bd52f11e1f6b1c63629d8a892712c9cbb010946f97460802a26269e660297f802d  helm_3.8.2_linux_arm64.tar.gz
+119f6cee49358207d151a70b936b20e6fd0857b06801eb5fd79dd341eb7b1a193c2d4e0bb1ba4a89d647e5a0d92431cf84ad09d4b3096fa859e2e38d0b19bcda  helm_3.14.0_linux_amd64.tar.gz
+119f6cee49358207d151a70b936b20e6fd0857b06801eb5fd79dd341eb7b1a193c2d4e0bb1ba4a89d647e5a0d92431cf84ad09d4b3096fa859e2e38d0b19bcda  helm_3.14.0_linux_arm64.tar.gz
+46bfa547be1ce8278c5719239aed178e657b438235558665633202dac5fde30543d745e5caa18eb3bde139c9514fde164dd85a6514019a0c315eda6959f92b6d  helm_3.14.0.tar.gz