Skip to content

Commit

Permalink
Merge pull request #35 from projectsyn/modulesync-0e13719
Browse files Browse the repository at this point in the history
[ModuleSync] Update from projectsyn/modulesync-control@0e13719
  • Loading branch information
ccremer authored Jul 8, 2021
2 parents 175dac2 + c704375 commit ea906ef
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 18 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ docs-serve: ## Preview the documentation

.PHONY: compile
.compile:
mkdir -p dependencies
$(COMMODORE_CMD)

.PHONY: test
test: commodore_args = -f tests/$(instance).yml
test: commodore_args = -f tests/$(instance).yml --search-paths ./dependencies
test: .compile ## Compile the component

.PHONY: clean
Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ JSONNETFMT_ARGS ?= --in-place --pad-arrays
JSONNET_IMAGE ?= docker.io/bitnami/jsonnet:latest
JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)

YAML_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.yaml' -or -name '*.yml' \))
YAML_FILES ?= $(shell find . -type f -not -regex './\(helmcharts\|manifests\|vendor\)/.*' \( -name '*.yaml' -or -name '*.yml' \))
YAMLLINT_ARGS ?= --no-warnings
YAMLLINT_CONFIG ?= .yamllint.yml
YAMLLINT_IMAGE ?= docker.io/cytopia/yamllint:latest
Expand Down
8 changes: 0 additions & 8 deletions tests/builtin.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
parameters:
_instance: builtin
kapitan:
dependencies:
- type: helm
chart_name: keycloak
version: ${keycloak:charts:keycloak}
source: https://codecentric.github.io/helm-charts
# Need to overwrite this path:
output_path: /keycloak/helmcharts/keycloak/${keycloak:charts:keycloak}/
8 changes: 0 additions & 8 deletions tests/external.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
parameters:
_instance: external
kapitan:
dependencies:
- type: helm
chart_name: keycloak
version: ${keycloak:charts:keycloak}
source: https://codecentric.github.io/helm-charts
# Need to overwrite this path:
output_path: /keycloak/helmcharts/keycloak/${keycloak:charts:keycloak}/

keycloak:
database:
Expand Down

0 comments on commit ea906ef

Please sign in to comment.