[CI] Fix sync k8s step

Author: pazone

.buildkite/scripts/steps/sync-k8s.sh

@@ -6,7 +6,13 @@ export PATH=$HOME/bin:${PATH}
 source .buildkite/scripts/install-gh.sh
 source .buildkite/scripts/common.sh
 
-export GITHUB_TOKEN=$(retry 5 vault kv get -field token kv/ci-shared/platform-ingest/github_token)
+GITHUB_TOKEN_VAULT_PATH="kv/ci-shared/platform-ingest/github_token"
+GITHUB_USERNAME_SECRET=$(retry 5 vault kv get -field username ${GITHUB_TOKEN_VAULT_PATH})
+export GITHUB_USERNAME_SECRET
+GITHUB_EMAIL_SECRET=$(retry 5 vault kv get -field email ${GITHUB_TOKEN_VAULT_PATH})
+export GITHUB_EMAIL_SECRET
+GITHUB_TOKEN_SECRET=$(retry 5 vault kv get -field token ${GITHUB_TOKEN_VAULT_PATH})
+export GITHUB_TOKEN_SECRET
 
 cd deploy/kubernetes
 

deploy/kubernetes/Makefile

@@ -62,9 +62,10 @@ $(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:
 ifeq ($(HASDIFF),1)
-	echo "INFO: Create branch to update k8s templates"
-	git config user.name obscloudnativemonitoring
-	git config user.email obs-cloudnative-monitoring@elastic.co
+	echo "INFO: Create branch to update k8s templates"	
+	git config user.name "${GITHUB_USERNAME_SECRET}"
+	git config user.email "${GITHUB_EMAIL_SECRET}"
+	git config remote.origin.url "https://${GITHUB_USERNAME_SECRET}:${GITHUB_EMAIL_SECRET}@github.com/elastic/kibana.git"
 	git checkout -b $(ELASTIC_AGENT_BRANCH)
 	echo "INFO: add files if any"
 	git add $(ELASTIC_AGENT_REPO_PATH)$(FILE_REPO)
@@ -77,7 +78,7 @@ ifeq ($(DRY_RUN),TRUE)
 	echo "INFO: skip pushing branch"
 else
 	echo "INFO: push branch"
-	@git push --set-upstream origin $(ELASTIC_AGENT_BRANCH) -u "$(GITHUB_TOKEN)"
+	@git push --set-upstream origin $(ELASTIC_AGENT_BRANCH)
 	echo "INFO: create pull request"
 	@gh pr create \
 		--title "Update kubernetes templates for elastic-agent" \