From 58a417f7d255a37cc3ddc915d5cf81366db10791 Mon Sep 17 00:00:00 2001 From: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> Date: Tue, 25 Apr 2023 20:44:19 +0000 Subject: [PATCH 1/3] added shasum for kubebuilder, kubectl, yq, kind Signed-off-by: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> --- make/tools.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 4380de4c1..123c1a938 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -233,7 +233,7 @@ $(foreach GO_DEPENDENCY,$(GO_DEPENDENCIES),$(eval $(call go_dependency,$(word 1, HELM_linux_amd64_SHA256SUM=781d826daec584f9d50a01f0f7dadfd25a3312217a14aa2fbb85107b014ac8ca HELM_darwin_amd64_SHA256SUM=404938fd2c6eff9e0dab830b0db943fca9e1572cd3d7ee40904705760faa390f HELM_darwin_arm64_SHA256SUM=f61a3aa55827de2d8c64a2063fd744b618b443ed063871b79f52069e90813151 - +HELM_linux_arm64_SHA256SUM=0a60baac83c3106017666864e664f52a4e16fbd578ac009f9a85456a9241c5db $(BINDIR)/downloaded/tools/helm@$(HELM_VERSION)_%: | $(BINDIR)/downloaded/tools $(CURL) https://get.helm.sh/helm-$(HELM_VERSION)-$(subst _,-,$*).tar.gz -o $@.tar.gz ./hack/util/checkhash.sh $@.tar.gz $(HELM_$*_SHA256SUM) @@ -253,7 +253,7 @@ $(BINDIR)/downloaded/tools/helm@$(HELM_VERSION)_%: | $(BINDIR)/downloaded/tools KUBECTL_linux_amd64_SHA256SUM=7fe3a762d926fb068bae32c399880e946e8caf3d903078bea9b169dcd5c17f6d KUBECTL_darwin_amd64_SHA256SUM=136f73ede0d52c7985d299432236f891515c050d58d71b4a7d39c45085020ad8 KUBECTL_darwin_arm64_SHA256SUM=a2029331fa70450a631506c83bb27ae95cc9fdb4b21efb81fde81c689d922ceb - +KUBECTL_linux_arm64_SHA256SUM=fd3cb8f16e6ed8aee9955b76e3027ac423b6d1cc7356867310d128082e2db916 $(BINDIR)/downloaded/tools/kubectl@$(KUBECTL_VERSION)_%: | $(BINDIR)/downloaded/tools $(CURL) https://storage.googleapis.com/kubernetes-release/release/$(KUBECTL_VERSION)/bin/$(subst _,/,$*)/kubectl -o $@ ./hack/util/checkhash.sh $@ $(KUBECTL_$*_SHA256SUM) @@ -266,7 +266,7 @@ $(BINDIR)/downloaded/tools/kubectl@$(KUBECTL_VERSION)_%: | $(BINDIR)/downloaded/ KIND_linux_amd64_SHA256SUM=705c722b0a87c9068e183f6d8baecd155a97a9683949ca837c2a500c9aa95c63 KIND_darwin_amd64_SHA256SUM=9c91e3a6f380ee4cab79094d3fade94eb10a4416d8d3a6d3e1bb9c616f392de4 KIND_darwin_arm64_SHA256SUM=96e0765d385c4e5457dc95dc49f66d385727885dfe1ad77520af0a32b7f8ccb2 - +KIND_linux_arm64_SHA256SUM=9c0320ac39b1f82f1011ae4e4ceb9c9865b528f59839b4d4eff7ab2804fac5f2 $(BINDIR)/downloaded/tools/kind@$(KIND_VERSION)_%: | $(BINDIR)/downloaded/tools $(BINDIR)/tools $(CURL) -sSfL https://github.com/kubernetes-sigs/kind/releases/download/$(KIND_VERSION)/kind-$(subst _,-,$*) -o $@ ./hack/util/checkhash.sh $@ $(KIND_$*_SHA256SUM) @@ -345,7 +345,7 @@ $(BINDIR)/downloaded/tools/ytt@$(YTT_VERSION)_%: | $(BINDIR)/downloaded/tools YQ_linux_amd64_SHA256SUM=9a54846e81720ae22814941905cd3b056ebdffb76bf09acffa30f5e90b22d615 YQ_darwin_amd64_SHA256SUM=79a55533b683c5eabdc35b00336aa4c107d7d719db0639a31892fc35d1436cdc YQ_darwin_arm64_SHA256SUM=40547a5049f15a1103268fd871baaa34a31ad30136ee27a829cf697737f392be - +YQ_linux_arm64_SHA256SUM=ea360a0ecdff30c8625ccd0b97f8714b8308a429fd839cf8ccc481f311e217c6 $(BINDIR)/downloaded/tools/yq@$(YQ_VERSION)_%: | $(BINDIR)/downloaded/tools $(CURL) https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$* -o $@ ./hack/util/checkhash.sh $@ $(YQ_$*_SHA256SUM) @@ -402,7 +402,7 @@ $(K8S_CODEGEN_TOOLS_DOWNLOADS): $(BINDIR)/downloaded/tools/%-gen@$(K8S_CODEGEN_V KUBEBUILDER_TOOLS_linux_amd64_SHA256SUM=e6ea8e2c6657dad0493f8c61c7a8fef444a5aa421019d09e7f4b6b4e3e9bd45d KUBEBUILDER_TOOLS_darwin_amd64_SHA256SUM=7d1690234e5cf601f1c8b403f835a3a74ffe6cac23a29293a1155ca552599706 KUBEBUILDER_TOOLS_darwin_arm64_SHA256SUM=069e902a99b3d224c455120c5178a8452eb76bc1d4e8cf5179d081e98dd7601c - +KUBEBUILDER_TOOLS_linux_arm64_SHA256SUM=afd2c4be4952164e412195f3f0fb318867ec65c52d45dd8d94fb158145659778 $(BINDIR)/downloaded/tools/etcd@$(KUBEBUILDER_ASSETS_VERSION)_%: $(BINDIR)/downloaded/tools/kubebuilder_tools_$(KUBEBUILDER_ASSETS_VERSION)_%.tar.gz | $(BINDIR)/downloaded/tools ./hack/util/checkhash.sh $< $(KUBEBUILDER_TOOLS_$*_SHA256SUM) @# O writes the specified file to stdout @@ -484,4 +484,4 @@ go-workspace: export GOWORK?=$(abspath go.work) go-workspace: @rm -f $(GOWORK) go work init - go work use . ./cmd/acmesolver ./cmd/cainjector ./cmd/controller ./cmd/ctl ./cmd/webhook ./test/integration ./test/e2e + go work use . ./cmd/acmesolver ./cmd/cainjector ./cmd/controller ./cmd/ctl ./cmd/webhook ./test/integration ./test/e2e \ No newline at end of file From 5e7154ea570f55b85a3176166142d90a86da0243 Mon Sep 17 00:00:00 2001 From: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> Date: Tue, 25 Apr 2023 20:47:31 +0000 Subject: [PATCH 2/3] fixed a bug and added linux-arm64 target in kubebuilder-shas script Signed-off-by: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> --- hack/latest-kubebuilder-shas.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/latest-kubebuilder-shas.sh b/hack/latest-kubebuilder-shas.sh index 5b7a6ed3b..08110aafa 100755 --- a/hack/latest-kubebuilder-shas.sh +++ b/hack/latest-kubebuilder-shas.sh @@ -23,7 +23,7 @@ set -eu -o pipefail if [ $# -ne 1 ]; then echo "error: incorrect number of args: usage ${0} " - echo "you can discover available versions by running gsutil ls gs://kubebuilder-tools + echo "you can discover available versions by running gsutil ls gs://kubebuilder-tools" exit 1 fi @@ -33,7 +33,7 @@ version=$1 kubebuilder_tools_storage_url="https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools" -os_arches=("linux-amd64" "darwin-amd64" "darwin-arm64") +os_arches=("linux-amd64" "darwin-amd64" "darwin-arm64" "linux-arm64") output=$(printf "Kubebuilder tools SHAs for version %s:" "$version") From 55567bdce4931fde07554cd922a786db29798ea7 Mon Sep 17 00:00:00 2001 From: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> Date: Thu, 27 Apr 2023 19:42:56 +0000 Subject: [PATCH 3/3] added trivy shasum Signed-off-by: Patrick Nannt <34661599+ptrc-n@users.noreply.github.com> --- LICENSES | 2 +- cmd/controller/LICENSES | 2 +- make/tools.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSES b/LICENSES index 8f4f160e0..d83ee8964 100644 --- a/LICENSES +++ b/LICENSES @@ -120,7 +120,7 @@ golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.6.0:LICENSE,BS golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.7.0:LICENSE,BSD-3-Clause golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.1.0:LICENSE,BSD-3-Clause -golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.5.0:LICENSE,BSD-3-Clause +golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.7.0:LICENSE,BSD-3-Clause golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause diff --git a/cmd/controller/LICENSES b/cmd/controller/LICENSES index 2d39546fc..8bc4d16ee 100644 --- a/cmd/controller/LICENSES +++ b/cmd/controller/LICENSES @@ -113,7 +113,7 @@ golang.org/x/crypto,https://cs.opensource.google/go/x/crypto/+/v0.6.0:LICENSE,BS golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.7.0:LICENSE,BSD-3-Clause golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/sync/errgroup,https://cs.opensource.google/go/x/sync/+/v0.1.0:LICENSE,BSD-3-Clause -golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.5.0:LICENSE,BSD-3-Clause +golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.5.0:LICENSE,BSD-3-Clause golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.7.0:LICENSE,BSD-3-Clause golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.3.0:LICENSE,BSD-3-Clause diff --git a/make/tools.mk b/make/tools.mk index 123c1a938..1af81bc2b 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -312,7 +312,7 @@ $(BINDIR)/downloaded/tools/rclone@$(RCLONE_VERSION)_%: | $(BINDIR)/downloaded/to TRIVY_linux_amd64_SHA256SUM=e6e1c4767881ab1e40da5f3bb499b1c9176892021c7cb209405078fc096d94d8 TRIVY_darwin_amd64_SHA256SUM=1cc8b2301f696b71c488d99c917a21a191ab26e1c093287c20112e8bb517ac4c TRIVY_darwin_arm64_SHA256SUM=41a3d4c12cd227cf95db6b30144b85e571541f587837f2f3814e2339dd81a21a - +TRIVY_linux_arm64_SHA256SUM=fd6e4b8f9ce7ad138b8fd46c7db308d1343f27ee8029766c939c5f66c5bef048 $(BINDIR)/downloaded/tools/trivy@$(TRIVY_VERSION)_%: | $(BINDIR)/downloaded/tools $(eval OS_AND_ARCH := $(subst darwin,macOS,$*)) $(eval OS_AND_ARCH := $(subst linux,Linux,$(OS_AND_ARCH)))