Skip to content

Commit 6083971

Browse files
committed
Updates on docs
1 parent cd0da86 commit 6083971

File tree

4 files changed

+65
-1
lines changed

4 files changed

+65
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ helm-start:
507507
$(AT)echo
508508
$(AT)echo "$(COLOR_RED)🌟 Running helm-start command.$(COLOR_NORMAL)"
509509
$(AT)echo
510-
$(AT)$(HELM_CMD) upgrade --install $(CLUSTER_NAME) -f charts/values.yaml --debug --create-namespace --namespace $(CLUSTER_NAMESPACE) charts
510+
$(AT)$(HELM_CMD) upgrade charts $(CLUSTER_NAME) --install --values charts/values.yaml --debug --atomic --create-namespace --timeout 8m0s --namespace $(CLUSTER_NAMESPACE)
511511
$(AT)echo
512512
$(AT)echo "$(COLOR_RED)Helm start command finished.$(COLOR_NORMAL)"
513513
$(AT)echo

makefiles/checks.mk

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
ifndef __CHECKS_MAKEFILE__
2+
3+
__CHECKS_MAKEFILE__ := included
4+
5+
################################################################################
6+
# Default checks #
7+
################################################################################
8+
# The .FEATURES variable is likely to be unique for GNU Make.
9+
ifeq ($(.FEATURES), )
10+
$(info Error: '$(MAKE)' does not seem to be GNU Make, which is a requirement.)
11+
$(info Check your path, or upgrade to GNU Make 3.81 or newer.)
12+
$(error Cannot continue)
13+
endif
14+
15+
# Assume we have GNU Make, but check version.
16+
ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
17+
$(info Error: This version of GNU Make is too low ($(MAKE_VERSION)).)
18+
$(info Check your path, or upgrade to GNU Make 3.81 or newer.)
19+
$(error Cannot continue)
20+
endif
21+
22+
# In Cygwin, the MAKE variable gets prepended with the current directory if the
23+
# make executable is called using a Windows mixed path (c:/cygwin/bin/make.exe).
24+
ifneq ($(findstring :, $(MAKE)), )
25+
MAKE := $(patsubst $(CURDIR)%, %, $(patsubst $(CURDIR)/%, %, $(MAKE)))
26+
endif
27+
28+
# Locate this Makefile
29+
ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
30+
makefile_path := $(CURDIR)/$(strip $(lastword $(MAKEFILE_LIST)))
31+
else
32+
makefile_path := $(lastword $(MAKEFILE_LIST))
33+
endif
34+
topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
35+
36+
endif

makefiles/defaults.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifndef __DEFAULTS_MAKEFILE__
2+
3+
__DEFAULTS_MAKEFILE__ := included
4+
15
################################################################################
26
# Default variables #
37
################################################################################
@@ -50,3 +54,5 @@ endif # No Rr
5054
# MAKEFLAGS stores the make flags.
5155
# MAKEFLAGS += --warn-undefined-variables
5256
MAKEFLAGS += $(CT_MAKEFLAGS)
57+
58+
endif

makefiles/utils/commons.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifndef __COMMONS_MAKEFILE__
2+
3+
__COMMONS_MAKEFILE__ := included
4+
15
################################################################################
26
# Default variables #
37
################################################################################
@@ -266,6 +270,22 @@ check_cli = type "$(1)" >/dev/null 2>&1 || { echo "Error: command '$(1)' require
266270
#@$(call check_cli,curl)
267271
#@$(call check_cli,jq)
268272

273+
################################################################################
274+
# Common functions #
275+
################################################################################
276+
277+
define print_target
278+
@$(call print_notice,Building $@...)
279+
endef
280+
281+
define print_notice
282+
printf "\n\033[93m\033[1m$(1)\033[0m\n"
283+
endef
284+
285+
define print_error
286+
printf "\n\033[93m\033[1m$(1)\033[0m\n"
287+
endef
288+
269289
################################################################################
270290
# Common targets #
271291
################################################################################
@@ -367,3 +387,5 @@ _list-env:
367387
$(AT)echo
368388
$(AT)echo "==========================================";
369389
$(AT)echo
390+
391+
endif

0 commit comments

Comments
 (0)