Skip to content

Commit 4e2ae88

Browse files
authored
Merge pull request #24 from containeroo/cruft/update
chore: update from Cruft template
2 parents aec4eb8 + 0add235 commit 4e2ae88

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.cruft.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"template": "https://github.com/projectsyn/commodore-component-template.git",
3-
"commit": "7e46facc758385bc32eeecab92b4639c66fd4e4f",
3+
"commit": "a5def401e0fd625486a985167f14b1e383a698be",
44
"skip": [
55
".github/workflows/*"
66
],
7-
"checkout": "main",
7+
"checkout": null,
88
"context": {
99
"cookiecutter": {
1010
"name": "vsphere-csi",
@@ -28,7 +28,7 @@
2828
"github_name": "component-vsphere-csi",
2929
"github_url": "https://github.com/projectsyn/component-vsphere-csi",
3030
"_template": "https://github.com/projectsyn/commodore-component-template.git",
31-
"_commit": "7e46facc758385bc32eeecab92b4639c66fd4e4f"
31+
"_commit": "a5def401e0fd625486a985167f14b1e383a698be"
3232
}
3333
},
3434
"directory": null

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sync-release: ## Sync manifest-derived defaults from the current vSphere CSI dri
4141

4242
.PHONY: format_jsonnet
4343
format_jsonnet: $(JSONNET_FILES) ## Format jsonnet files
44-
$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) -- $?
44+
$(JSONNET_DOCKER) $(JSONNETFMT_ARGS) --in-place -- $?
4545

4646
.PHONY: docs-serve
4747
docs-serve: ## Preview the documentation

Makefile.vars.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endif
2525
DOCKER_ARGS ?= run --rm -u "$$(id -u):$$(id -g)" --userns=$(DOCKER_USERNS) -w /$(COMPONENT_NAME) -e HOME="/$(COMPONENT_NAME)"
2626

2727
JSONNET_FILES ?= $(shell find . -type f -not -path './vendor/*' \( -name '*.*jsonnet' -or -name '*.libsonnet' \))
28-
JSONNETFMT_ARGS ?= --in-place --pad-arrays
28+
JSONNETFMT_ARGS ?= --pad-arrays
2929
JSONNET_IMAGE ?= ghcr.io/projectsyn/jsonnet:latest
3030
JSONNET_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=jsonnetfmt $(JSONNET_IMAGE)
3131

0 commit comments

Comments
 (0)