Skip to content

Commit

Permalink
fix: avoid installing the registry multiple times
Browse files Browse the repository at this point in the history
While the fill-test-ci-values target's dependency on install-registry
was correctly manipulated by the SKIP_INSTALL_REGISTRY variable, the
install-lagoon-build-deploy target had a hard-coded dependency on
install-registry. The result was that the registry would get installed
multiple times anyway via the fill-test-ci-values target via an indirect
dependency.

Fix that by removing the dependency that install-lagoon-build-deploy has
on install-registry when SKIP_INSTALL_REGISTRY=true.
  • Loading branch information
smlx committed Dec 14, 2023
1 parent 37fbe21 commit fb9a9e5
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ install-lagoon-remote: install-lagoon-build-deploy install-lagoon-core install-m
# Do not install without lagoon-core
#
.PHONY: install-lagoon-build-deploy
install-lagoon-build-deploy: install-lagoon-core install-registry
install-lagoon-build-deploy: install-lagoon-core
$(HELM) dependency build ./charts/lagoon-build-deploy/
$(HELM) upgrade \
--install \
Expand All @@ -285,6 +285,11 @@ install-lagoon-build-deploy: install-lagoon-core install-registry
lagoon-build-deploy \
./charts/lagoon-build-deploy

# allow skipping registry install for install-lagoon-remote target
ifneq ($(SKIP_INSTALL_REGISTRY),true)
install-lagoon-build-deploy: install-registry
endif

#
# The following targets facilitate local development only and aren't used in CI.
#
Expand Down

0 comments on commit fb9a9e5

Please sign in to comment.