Skip to content

Commit

Permalink
chore: integrate helm-values-schema-json to generate schema for value…
Browse files Browse the repository at this point in the history
…s.yaml (#4435)
  • Loading branch information
g1eny0ung authored Jun 19, 2024
1 parent aef9e82 commit 5887f7f
Show file tree
Hide file tree
Showing 7 changed files with 223 additions and 132 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ jobs:
run: |
if [[ "$job" == "verify" ]]; then
make check
echo "Please make check before creating a PR"
git diff --quiet -- . || (git diff | cat && false)
echo "Please run [make check] before creating a PR"
git diff --quiet
elif [[ "$job" == "build" ]]; then
make image
elif [[ "$job" == "test" ]]; then
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
- Support for setting `loadBalancerSourceRanges` in chaos-dashboard service in helm chart [#4172](https://github.com/chaos-mesh/chaos-mesh/pull/4172)
- Helm: allow templating of dashboard rootUrl [#4370](https://github.com/chaos-mesh/chaos-mesh/pull/4370)
- Support for reading database connection string from secret [#4363](https://github.com/chaos-mesh/chaos-mesh/pull/4363)
- Allow if condition for creating chaos-controller-manager ServiceAccount and allow setting securityContext for chaos-daemon pods [#4390](https://github.com/chaos-mesh/chaos-mesh/pull/4390)
- Integrate helm-values-schema-json to generate schema for values.yaml [#4435](https://github.com/chaos-mesh/chaos-mesh/pull/4435)

### Changed

Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ swagger_spec: images/dev-env/.dockerbuilt ## Generate OpenAPI/Swagger spec for f

##@ Linters, formatters and others

check: generate manifests/crd.yaml vet boilerplate lint tidy install.sh fmt ## Run prerequisite checks for PR
check: generate manifests/crd.yaml vet boilerplate lint fmt tidy install.sh helm-values-schema ## Run prerequisite checks for PR

SKYWALKING_EYES_HEADER = /go/bin/license-eye header -c ./.github/.licenserc.yaml
boilerplate: SHELL:=$(RUN_IN_DEV_SHELL)
Expand Down Expand Up @@ -172,6 +172,10 @@ vet: SHELL:=$(RUN_IN_DEV_SHELL)
vet: images/dev-env/.dockerbuilt ## Lint go files with go vet
$(CGOENV) go vet ./...

helm-values-schema: SHELL:=$(RUN_IN_DEV_SHELL)
helm-values-schema: images/dev-env/.dockerbuilt
helm schema -input helm/chaos-mesh/values.yaml -output helm/chaos-mesh/values.schema.json

##@ Common used building targets

all: manifests/crd.yaml image ## Build all CRD yaml manifests and components container images
Expand Down Expand Up @@ -287,7 +291,6 @@ pkg/time/fakeclock/fake_gettimeofday.o: pkg/time/fakeclock/fake_gettimeofday.c i
[[ "$$TARGET_PLATFORM" == "arm64" ]] && CFLAGS="-mcmodel=tiny" ;\
cc -c ./pkg/time/fakeclock/fake_gettimeofday.c -fPIE -O2 -o pkg/time/fakeclock/fake_gettimeofday.o $$CFLAGS


CLEAN_TARGETS += e2e-test/image/e2e/manifests e2e-test/image/e2e/chaos-mesh

e2e-test/image/e2e/manifests: manifests ## Copy CRD manifests to e2e image build directory
Expand Down
1 change: 1 addition & 0 deletions build/get_env_shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def main():

cwd = os.getcwd()
cmd += ["--volume", f"{cwd}:{cwd}"]
# HACK: if you have permission issues when using Docker Desktop for Mac, you can try removing this line to see if it works.
cmd += ["--user", f"{os.getuid()}:{os.getgid()}"]

target_platform = utils.get_target_platform()
Expand Down
Loading

0 comments on commit 5887f7f

Please sign in to comment.