Skip to content

Commit

Permalink
PSS-2862: additional security fixes (#12)
Browse files Browse the repository at this point in the history
* update helm

* fix gitleaks check
  • Loading branch information
TylerGillson authored Jun 27, 2023
1 parent 9378fce commit 09410bc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/bulwark-gitleaks-pr-validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ jobs:
shell: sh
run: |
resultPath=./$REPO/gitleaks.json
if ! [ -f $resultPath ]; then
echo "GitLeaks validation check skipped"
exit 0
fi
cat $resultPath | grep -v \"Match\"\: | grep -v \"Secret\"\:
total_failed_tests=`cat $resultPath | grep \"Fingerprint\"\: | wc -l`
if [ "$total_failed_tests" -gt 0 ]; then
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ IMG ?= $(IMG_URL)/$(IMG_NAME):$(IMG_TAG)

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.23
HELM_VERSION = 3.12.0
# HELM_VERSION = 3.12.0
HELM_VERSION = 3.11.2-20230627
VCLUSTER_CHART_VERSION = 0.13.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
Expand Down Expand Up @@ -177,13 +178,13 @@ binaries: helm download-chart ## Download binaries
.PHONY: helm
helm: bin-dir
if ! test -f $(BIN_DIR)/helm-$(GOOS)-$(GOARCH); then \
curl -Ls https://github.com/spectrocloud/helm/releases/download/v3.11.2-20230622/helm_v3.11.2-20230622_$(GOOS)_$(GOARCH).tar.gz | tar -xz; \
curl -Ls https://github.com/spectrocloud/helm/releases/download/v$(HELM_VERSION)/helm_v$(HELM_VERSION)_$(GOOS)_$(GOARCH).tar.gz | tar -xz; \
mv $(GOOS)-$(GOARCH)/helm $(BIN_DIR)/helm-$(GOOS)-$(GOARCH); \
chmod +x $(BIN_DIR)/helm-$(GOOS)-$(GOARCH); \
rm -rf ./$(GOOS)-$(GOARCH)/; \
fi
if ! test -f $(BIN_DIR)/helm-linux-amd64; then \
curl -Ls https://github.com/spectrocloud/helm/releases/download/v3.11.2-20230622/helm_v3.11.2-20230622_linux_amd64.tar.gz | tar -xz; \
curl -Ls https://github.com/spectrocloud/helm/releases/download/v$(HELM_VERSION)/helm_v$(HELM_VERSION)_linux_amd64.tar.gz | tar -xz; \
mv linux-amd64/helm $(BIN_DIR)/helm-linux-amd64; \
chmod +x $(BIN_DIR)/helm-linux-amd64; \
rm -rf ./linux-amd64; \
Expand Down

0 comments on commit 09410bc

Please sign in to comment.