Use CodeFlare machine user to push PR into OpenShift community operat…

…ors repository
project-codeflare · Jul 7, 2023 · 34602ce · 34602ce
1 parent e04fbfa
commit 34602ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/tag-and-build.yml b/.github/workflows/tag-and-build.yml
@@ -102,7 +102,7 @@ jobs:
         PREVIOUS_VERSION: ${{ github.event.inputs.replaces }}
         INSTASCALE_VERSION: ${{ github.event.inputs.instascale-version }}
         MCAD_VERSION: ${{ github.event.inputs.mcad-version }}
-        GH_TOKEN: ${{ secrets.GH_PAT }}
+        GH_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
         IMAGE_ORG_BASE: quay.io/${{ github.event.inputs.quay-organization }}
         OPERATORS_REPO_FORK_ORG: ${{ github.event.inputs.community-operators-prod-fork-organization }}
         OPERATORS_REPO_ORG: ${{ github.event.inputs.community-operators-prod-organization }}
@@ -125,7 +125,7 @@ jobs:
       uses: stefanzweifel/git-auto-commit-action@v4
       with:
         commit_message: Update dependency versions for release ${{ github.event.inputs.version }}
-        file_pattern: 'README.md controllers/defaults.go *.yaml *.tmpl Makefile'
+        file_pattern: 'README.md controllers/defaults.go *.yaml Makefile'
 
     - name: Creates a release in GitHub
       run: |

diff --git a/Makefile b/Makefile
@@ -368,11 +368,11 @@ bundle-push: ## Push the bundle image.
 
 .PHONY: openshift-community-operator-release
 openshift-community-operator-release: install-gh-cli bundle ## build bundle and create PR in OpenShift community operators repository
-	git clone https://$(GH_TOKEN)@github.com/$(OPERATORS_REPO_FORK_ORG)/community-operators-prod.git
+	git clone https://x-access-token:$(GH_TOKEN)@github.com/$(OPERATORS_REPO_FORK_ORG)/community-operators-prod.git
 	cd community-operators-prod && git remote add upstream https://github.com/$(OPERATORS_REPO_ORG)/community-operators-prod.git && git pull upstream main && git push origin main
 	cp -r bundle community-operators-prod/operators/codeflare-operator/$(BUNDLE_VERSION)
 	cd community-operators-prod && git checkout -b codeflare-release-$(BUNDLE_VERSION) && git add operators/codeflare-operator/$(BUNDLE_VERSION)/* && git commit -m "add bundle manifests codeflare version $(BUNDLE_VERSION)" && git push origin codeflare-release-$(BUNDLE_VERSION)
-	gh pr create --repo $(OPERATORS_REPO_FORK_ORG)/community-operators-prod --title "CodeFlare $(BUNDLE_VERSION)" --body "New release of codeflare operator" --head $(OPERATORS_REPO_ORG):codeflare-release-$(BUNDLE_VERSION) --base main
+	gh pr create --repo $(OPERATORS_REPO_ORG)/community-operators-prod --title "CodeFlare $(BUNDLE_VERSION)" --body "New release of codeflare operator" --head $(OPERATORS_REPO_FORK_ORG):codeflare-release-$(BUNDLE_VERSION) --base main
 	rm -rf community-operators-prod
 
 .PHONY: opm