Skip to content

Commit bd26722

Browse files
authored
Fix Makefile syntax and version consistency (#1413)
Signed-off-by: bo.jiang <[email protected]>
1 parent 0eaf592 commit bd26722

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ uninstall: generate kustomize ## Uninstall CRDs from the K8s cluster specified i
328328
$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
329329

330330
##@ Helm
331-
PHONY: inferencepool-helm-chart-push
331+
.PHONY: inferencepool-helm-chart-push
332332
inferencepool-helm-chart-push: yq helm
333333
CHART=inferencepool EXTRA_TAG="$(EXTRA_TAG)" IMAGE_REGISTRY="$(IMAGE_REGISTRY)" YQ="$(YQ)" HELM="$(HELM)" ./hack/push-chart.sh
334334

335-
PHONY: bbr-helm-chart-push
335+
.PHONY: bbr-helm-chart-push
336336
bbr-helm-chart-push: yq helm
337337
CHART=body-based-routing EXTRA_TAG="$(EXTRA_TAG)" IMAGE_REGISTRY="$(IMAGE_REGISTRY)" YQ="$(YQ)" HELM="$(HELM)" ./hack/push-chart.sh
338338

@@ -378,6 +378,7 @@ GOLANGCI_LINT_VERSION ?= v2.3.0
378378
HELM_VERSION ?= v3.17.1
379379
KUBECTL_VALIDATE_VERSION ?= v0.0.4
380380
GCI_VERSION ?= v0.13.6
381+
YQ_VERSION ?= v4.45.1
381382

382383
.PHONY: kustomize
383384
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -401,7 +402,7 @@ $(GOLANGCI_LINT): $(LOCALBIN)
401402

402403
.PHONY: yq
403404
yq: ## Download yq locally if necessary.
404-
GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/v4@v4.45.1
405+
GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on go install github.com/mikefarah/yq/v4@$(YQ_VERSION)
405406

406407
.PHONY: helm
407408
helm: ## Download helm locally if necessary.

bbr.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile has specific requirement to put this ARG at the beginning:
22
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
3-
ARG BUILDER_IMAGE=golang:1.23
3+
ARG BUILDER_IMAGE=golang:1.24
44
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot
55

66
## Multistage build

0 commit comments

Comments
 (0)