Skip to content
This repository has been archived by the owner on May 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #101 from turkenh/fix-helm-package-parallel
Browse files Browse the repository at this point in the history
Helm: fix race condition for parallel package's
  • Loading branch information
turkenh committed Jun 25, 2020
2 parents 07bdd8e + cedbdb3 commit 276b947
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions makelib/golang.mk
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ ifeq ($(RUNNING_IN_CI),true)
# Output checkstyle XML rather than human readable output.
# the timeout is increased to 10m, to accommodate CI machines with low resources.
GO_LINT_ARGS := --timeout 10m0s --out-format=checkstyle > $(GO_LINT_OUTPUT)/checkstyle.xml

# Output verbose tests that can be parsed into JUnit XML.
GO_TEST_FLAGS += -v
endif

# NOTE: the install suffixes are matched with the build container to speed up the
Expand Down
2 changes: 1 addition & 1 deletion makelib/helm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ $(HELM_OUTPUT_DIR):
define helm.chart
$(HELM_OUTPUT_DIR)/$(1)-$(HELM_CHART_VERSION).tgz: $(HELM_HOME) $(HELM_OUTPUT_DIR) $(shell find $(HELM_CHARTS_DIR)/$(1) -type f)
@$(INFO) helm package $(1) $(HELM_CHART_VERSION)
@$(HELM) package --version $(HELM_CHART_VERSION) --app-version $(HELM_CHART_VERSION) -d $(HELM_OUTPUT_DIR) $(abspath $(HELM_CHARTS_DIR)/$(1))
@$(HELM) package --version $(HELM_CHART_VERSION) --app-version $(HELM_CHART_VERSION) --save=false -d $(HELM_OUTPUT_DIR) $(abspath $(HELM_CHARTS_DIR)/$(1))
@$(OK) helm package $(1) $(HELM_CHART_VERSION)

helm.prepare.$(1): $(HELM_HOME)
Expand Down

0 comments on commit 276b947

Please sign in to comment.