diff --git a/Makefile b/Makefile index ba66ef46b..f2e6ab913 100644 --- a/Makefile +++ b/Makefile @@ -328,11 +328,11 @@ uninstall: generate kustomize ## Uninstall CRDs from the K8s cluster specified i $(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f - ##@ Helm -PHONY: inferencepool-helm-chart-push +.PHONY: inferencepool-helm-chart-push inferencepool-helm-chart-push: yq helm CHART=inferencepool EXTRA_TAG="$(EXTRA_TAG)" IMAGE_REGISTRY="$(IMAGE_REGISTRY)" YQ="$(YQ)" HELM="$(HELM)" ./hack/push-chart.sh -PHONY: bbr-helm-chart-push +.PHONY: bbr-helm-chart-push bbr-helm-chart-push: yq helm CHART=body-based-routing EXTRA_TAG="$(EXTRA_TAG)" IMAGE_REGISTRY="$(IMAGE_REGISTRY)" YQ="$(YQ)" HELM="$(HELM)" ./hack/push-chart.sh @@ -378,6 +378,7 @@ GOLANGCI_LINT_VERSION ?= v2.3.0 HELM_VERSION ?= v3.17.1 KUBECTL_VALIDATE_VERSION ?= v0.0.4 GCI_VERSION ?= v0.13.6 +YQ_VERSION ?= v4.45.1 .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. @@ -401,7 +402,7 @@ $(GOLANGCI_LINT): $(LOCALBIN) .PHONY: yq yq: ## Download yq locally if necessary. - GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/v4@v4.45.1 + GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/v4@$(YQ_VERSION) .PHONY: helm helm: ## Download helm locally if necessary. diff --git a/bbr.Dockerfile b/bbr.Dockerfile index 8f21eeaaf..36ae378cc 100644 --- a/bbr.Dockerfile +++ b/bbr.Dockerfile @@ -1,6 +1,6 @@ # Dockerfile has specific requirement to put this ARG at the beginning: # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact -ARG BUILDER_IMAGE=golang:1.23 +ARG BUILDER_IMAGE=golang:1.24 ARG BASE_IMAGE=gcr.io/distroless/static:nonroot ## Multistage build