diff --git a/.cruft.json b/.cruft.json index 14123df..44a0598 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,10 +1,10 @@ { "template": "https://github.com/projectsyn/commodore-component-template.git", - "commit": "7e46facc758385bc32eeecab92b4639c66fd4e4f", + "commit": "a5def401e0fd625486a985167f14b1e383a698be", "skip": [ ".github/workflows/*" ], - "checkout": "main", + "checkout": null, "context": { "cookiecutter": { "name": "vsphere-csi", @@ -28,7 +28,7 @@ "github_name": "component-vsphere-csi", "github_url": "https://github.com/projectsyn/component-vsphere-csi", "_template": "https://github.com/projectsyn/commodore-component-template.git", - "_commit": "7e46facc758385bc32eeecab92b4639c66fd4e4f" + "_commit": "a5def401e0fd625486a985167f14b1e383a698be" } }, "directory": null diff --git a/Makefile b/Makefile index c2236bd..0de5f78 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ sync-release: ## Sync manifest-derived defaults from the current vSphere CSI dri .PHONY: format_jsonnet format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files - $(JSONNET_DOCKER) $(JSONNETFMT_ARGS) -- $? + $(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $? .PHONY: docs-serve docs-serve: ## Preview the documentation diff --git a/Makefile.vars.mk b/Makefile.vars.mk index 706fd00..e51ecad 100644 --- a/Makefile.vars.mk +++ b/Makefile.vars.mk @@ -25,7 +25,7 @@ endif DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)" JSONNET_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \)) -JSONNETFMT_ARGS ?= --in-place --pad-arrays +JSONNETFMT_ARGS ?= --pad-arrays JSONNET_IMAGE ?= ghcr.io/projectsyn/jsonnet:latest JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)