Skip to content

Commit

Permalink
ref(build): remove need for helm dependency update
Browse files Browse the repository at this point in the history
This change commits the subcharts in charts/osm/charts so `helm
dependency update` is no longer needed frequently since that command has
been failing recently in CI intermittently. `helm dependency update`
will still need to be run in the future only when a new version of a
subchart is needed.

Fixes openservicemesh#4284

Signed-off-by: Jon Huhn <johuhn@microsoft.com>
  • Loading branch information
nojnhuh committed Oct 21, 2021
1 parent c38eb25 commit 8267fe8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ creds.json
screenlog.*
demo/bin/
*.tgz
!**/charts/*.tgz # dependency charts pulled by Helm
*.wasm

## Ignore test coverage files
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ build-osm: cmd/cli/chart.tgz
CGO_ENABLED=0 go build -v -o ./bin/osm -ldflags ${LDFLAGS} ./cmd/cli

cmd/cli/chart.tgz: scripts/generate_chart/generate_chart.go $(shell find charts/osm)
helm dependency update charts/osm
go run $< > $@

.PHONY: clean-osm
Expand Down
Binary file added charts/osm/charts/contour-5.1.0.tgz
Binary file not shown.
7 changes: 7 additions & 0 deletions docs/development_guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,3 +300,10 @@ The different chart templates are used as follows:

The [`charts/osm/crds/`](/charts/osm/crds/) folder contains the charts corresponding to the SMI CRDs.
Experimental CRDs can be found under [`charts/osm/crds/experimental/`](/charts/osm/crds/experimental).

### Updating Dependencies

Dependencies for the OSM chart are listed in Chart.yaml. To update a dependency,
modify its version as needed in Chart.yaml, run `helm dependency update`, then
commit all changes to Chart.yaml, Chart.lock, and the charts/osm/charts
directory which stores the source for the updated dependency chart.

0 comments on commit 8267fe8

Please sign in to comment.