Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading