Skip to content

Commit

Permalink
Update Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
cruizen committed Sep 24, 2024
1 parent 655b425 commit b7ab1b6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
16 changes: 6 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@ SHELL=/bin/bash
#IMG ?= controller:latest

ifndef OVERRIDE_LUIGI_VERSION
IMG_TAG = $(shell ./get-label.bash)
IMG_TAG = $(shell ./get-label.bash)
else
ifneq ($(strip $(OVERRIDE_LUIGI_VERSION)),)
IMG_TAG ?= $(OVERRIDE_LUIGI_VERSION)
else
IMG_TAG = $(shell ./get-label.bash)
endif
endif
IMG_TAG = $(shell ./get-label.bash)
else
IMG_TAG ?= $(OVERRIDE_LUIGI_VERSION)
ifneq ($(strip $(OVERRIDE_LUIGI_VERSION)),)
IMG_TAG ?= $(OVERRIDE_LUIGI_VERSION)
else
IMG_TAG = $(shell ./get-label.bash)
endif
endif

IMG ?= quay.io/platform9/luigi-plugins:$(IMG_TAG)
Expand Down
13 changes: 7 additions & 6 deletions hostplumber/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ SHELL=/bin/bash
# Image URL to use all building/pushing image targets

ifndef OVERRIDE_HOSTPLUMBER_VERSION
IMG_TAG = $(shell ./get-label.bash)
IMG_TAG = $(shell ./get-label.bash)
else
ifneq ($(strip $(OVERRIDE_HOSTPLUMBER_VERSION)),)
IMG_TAG ?= $(OVERRIDE_HOSTPLUMBER_VERSION)
else
IMG_TAG = $(shell ./get-label.bash)
endif
ifneq ($(strip $(OVERRIDE_HOSTPLUMBER_VERSION)),)
IMG_TAG ?= $(OVERRIDE_HOSTPLUMBER_VERSION)
else
IMG_TAG = $(shell ./get-label.bash)
endif
endif

IMG ?= quay.io/platform9/hostplumber:$(IMG_TAG)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.27
Expand Down

0 comments on commit b7ab1b6

Please sign in to comment.