Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing makefile check #1490

Merged
merged 2 commits into from
Oct 13, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions deploy/kubernetes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ ci-clone-kibana-repository:
cp $(FILE_REPO) $(ELASTIC_AGENT_REPO)/$(ELASTIC_AGENT_REPO_PATH)

## ci-create-kubernetes-templates-pull-request : Create the pull request for the kubernetes templates
$(eval HASDIFF =$(shell sh -c "git status | grep $(FILE_REPO) | wc -l"))
.PHONY: ci-create-kubernetes-templates-pull-request
ci-create-kubernetes-templates-pull-request:
HASDIFF=`git status | grep $(FILE_REPO) | wc -l`; \
echo $${HASDIFF}
ifeq ($${HASDIFF},1)
ifeq ($(HASDIFF),1)
echo "INFO: Create branch to update k8s templates"
git config user.name obscloudnativemonitoring
git config user.email [email protected]
Expand All @@ -79,8 +78,7 @@ else
--base main \
--head $(ELASTIC_AGENT_BRANCH) \
--reviewer elastic/obs-cloudnative-monitoring
endif

endif
else
echo "No differences found with kibana git repository"
endif
Expand Down