From cf84e1c570dde29449700f8121423a69fe4e53fe Mon Sep 17 00:00:00 2001 From: simu Date: Mon, 11 Jul 2022 08:56:42 +0000 Subject: [PATCH] Update from projectsyn/modulesync-control --- Makefile | 6 +++++- Makefile.vars.mk | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6b3ae9b..9632032 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ help: ## Show this help all: lint .PHONY: lint -lint: lint_jsonnet lint_yaml lint_adoc ## All-in-one linting +lint: lint_jsonnet lint_yaml lint_adoc lint_kubent ## All-in-one linting .PHONY: lint_jsonnet lint_jsonnet: $(JSONNET_FILES) ## Lint jsonnet files @@ -35,6 +35,10 @@ lint_yaml: ## Lint yaml files lint_adoc: ## Lint documentation $(VALE_CMD) $(VALE_ARGS) +.PHONY: lint_kubent +lint_kubent: ## Lint deprecated Kubernetes API versions + $(KUBENT_DOCKER) $(KUBENT_ARGS) -f $(KUBENT_FILES) + .PHONY: format format: format_jsonnet ## All-in-one formatting diff --git a/Makefile.vars.mk b/Makefile.vars.mk index abda97f..dd6b9c0 100644 --- a/Makefile.vars.mk +++ b/Makefile.vars.mk @@ -40,4 +40,12 @@ COMMODORE_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) docker.io/projects COMPILE_CMD ?= $(COMMODORE_CMD) component compile . $(commodore_args) JB_CMD ?= $(DOCKER_CMD) $(DOCKER_ARGS) --entrypoint /usr/local/bin/jb docker.io/projectsyn/commodore:latest install +GOLDEN_FILES ?= $(shell find tests/golden/$(instance) -type f) + +KUBENT_FILES ?= $(shell echo "$(GOLDEN_FILES)" | sed 's/ /,/g') +KUBENT_ARGS ?= -c=false --helm2=false --helm3=false -e +# Use our own kubent image until the upstream image is available +KUBENT_IMAGE ?= docker.io/projectsyn/kubent:latest +KUBENT_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE) + instance ?= defaults