[main] security fix

Author: Abhishek Valaboju

hack/make/deps.mk

@@ -1,8 +1,16 @@
 # renovate: datasource=github-release-attachments depName=golangci/golangci-lint
-GOLANGCI_VERSION = v2.1.6
+GOLANGCI_VERSION = v2.11.4
+GOLANGCI_SUM_amd64 := 200c5b7503f67b59a6743ccf32133026c174e272b930ee79aa2aa6f37aca7ef1
+GOLANGCI_SUM_arm64 := 3bcfa2e6f3d32b2bf5cd75eaa876447507025e0303698633f722a05331988db4
 # renovate: datasource=github-release-attachments depName=k3d-io/k3d
 K3D_VERSION = v5.8.3
-
-KUBECTL_VERSION = 1.31.10
+K3D_SUM_amd64 := dbaa79a76ace7f4ca230a1ff41dc7d8a5036a8ad0309e9c54f9bf3836dbe853e
+K3D_SUM_arm64 := 0b8110f2229631af7402fb828259330985918b08fefd38b7f1b788a1c8687216
+# renovate: datasource=github-releases packageName=kubernetes/kubernetes
+KUBECTL_VERSION = 1.35.3
+KUBECTL_SUM_amd64 := fd31c7d7129260e608f6faf92d5984c3267ad0b5ead3bced2fe125686e286ad6
+KUBECTL_SUM_arm64 := 6f0cd088a82dde5d5807122056069e2fac4ed447cc518efc055547ae46525f14
 # renovate: datasource=github-release-attachments depName=helm/helm
-HELM_VERSION = v3.18.2
+HELM_VERSION = v4.1.3
+HELM_SUM_amd64 := 02ce9722d541238f81459938b84cf47df2fdf1187493b4bfb2346754d82a4700
+HELM_SUM_arm64 := 5db45e027cc8de4677ec869e5d803fc7631b0bab1c1eb62ac603a62d22359a43

hack/make/tools.mk

@@ -12,34 +12,45 @@ endif
 K3D = $(TOOLS_BIN)/k3d-$(K3D_VERSION)
 $(K3D):
 	rm -f $(TOOLS_BIN)/k3d*
-	curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | \
-		PATH=$(PATH):$(TOOLS_BIN) K3D_INSTALL_DIR="$(TOOLS_BIN)" TAG="$(K3D_VERSION)" USE_SUDO=false bash
-	mv $(TOOLS_BIN)/k3d $(TOOLS_BIN)/k3d-$(K3D_VERSION)
+	curl -sSfL -o $(K3D) "https://github.com/k3d-io/k3d/releases/download/$(K3D_VERSION)/k3d-$(OS_NAME)-$(OS_ARCH)"
+	K3D_SUM_VAR=K3D_SUM_$(OS_ARCH); \
+	echo "$${!K3D_SUM_VAR}  $(K3D)" | shasum -a 256 -c -
+	chmod u+x $(K3D)
 
 GOLANGCI = $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+GOLANGCI_VERSION_TRIMMED := $(GOLANGCI_VERSION:v%=%)
 $(GOLANGCI):
-	rm -f $(TOOLS_BIN)/golangci-lint*
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_VERSION)
-	mv $(TOOLS_BIN)/golangci-lint $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+	rm -rf $(TOOLS_BIN)/golangci*
+	curl -sSfL -o $(TOOLS_BIN)/golangci.tar.gz \
+		"https://github.com/golangci/golangci-lint/releases/download/$(GOLANGCI_VERSION)/golangci-lint-$(GOLANGCI_VERSION_TRIMMED)-$(OS_NAME)-$(OS_ARCH).tar.gz"
+	echo "$(GOLANGCI_SUM_$(OS_ARCH))  $(TOOLS_BIN)/golangci.tar.gz" | shasum -a 256 -c -
+	tar -xf $(TOOLS_BIN)/golangci.tar.gz -C $(TOOLS_BIN)
+	mv $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION_TRIMMED)-$(OS_NAME)-$(OS_ARCH)/golangci-lint $(GOLANGCI)
+	chmod u+x $(GOLANGCI)
+	rm -rf $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION_TRIMMED)-$(OS_NAME)-$(OS_ARCH)
+	rm -f $(TOOLS_BIN)/golangci.tar.gz
 
 KUBECTL = $(TOOLS_BIN)/kubectl-$(KUBECTL_VERSION)
 $(KUBECTL):
 	rm -f $(TOOLS_BIN)/kubectl*
-	curl --output $(KUBECTL) -sSfL "https://dl.k8s.io/release/v$(KUBECTL_VERSION)/bin/$(OS_NAME)/$(OS_ARCH)/kubectl"
-	echo "$(shell curl -L "https://dl.k8s.io/release/v$(KUBECTL_VERSION)/bin/$(OS_NAME)/$(OS_ARCH)/kubectl.sha256")  $(KUBECTL)" | shasum -a 256 -c -
+	curl -sSfL -o $(KUBECTL) \
+		"https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(OS_NAME)/$(OS_ARCH)/kubectl"
+	KUBECTL_SUM_VAR=KUBECTL_SUM_$(OS_ARCH); \
+	echo "$${!KUBECTL_SUM_VAR}  $(KUBECTL)" | shasum -a 256 -c -
 	chmod u+x $(KUBECTL)
 
 HELM = $(TOOLS_BIN)/helm-$(HELM_VERSION)
 $(HELM):
 	rm -rf $(TOOLS_BIN)/helm*
 	mkdir -p $(TOOLS_BIN)/tmp-helm
-	curl --output $(TOOLS_BIN)/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz -sSfL "https://get.helm.sh/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz"
-	$(call indirect-value,HELM_SUM)
-	cd $(TOOLS_BIN) && echo "$(shell curl -L "https://get.helm.sh/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz.sha256sum")" | shasum -a 256 -c -
-	tar -xf $(TOOLS_BIN)/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz --strip-components 1 -C $(TOOLS_BIN)/tmp-helm
+	curl -sSfL -o $(TOOLS_BIN)/helm.tar.gz \
+		"https://get.helm.sh/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz"
+	HELM_SUM_VAR=HELM_SUM_$(OS_ARCH); \
+	echo "$${!HELM_SUM_VAR}  $(TOOLS_BIN)/helm.tar.gz" | shasum -a 256 -c -
+	tar -xf $(TOOLS_BIN)/helm.tar.gz --strip-components 1 -C $(TOOLS_BIN)/tmp-helm
 	mv $(TOOLS_BIN)/tmp-helm/helm $(HELM)
 	chmod u+x $(HELM)
-	rm -rf $(TOOLS_BIN)/helm-$(HELM_VERSION)-$(OS_NAME)-$(OS_ARCH).tar.gz $(TOOLS_BIN)/tmp-helm
+	rm -rf $(TOOLS_BIN)/helm.tar.gz $(TOOLS_BIN)/tmp-helm
 
 # go-install-tool will 'go install' any package $2 and install it as $1.
 define go-install-tool