From e199c57062a97a823bf554e92f6a6a4bbbe08c5a Mon Sep 17 00:00:00 2001 From: Karel Suta Date: Fri, 7 Jul 2023 11:09:14 +0200 Subject: [PATCH 1/2] Use CodeFlare machine user to push PR into OpenShift community operators repository --- .github/workflows/tag-and-build.yml | 8 ++++---- Makefile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tag-and-build.yml b/.github/workflows/tag-and-build.yml index 413ccf2d..b823fc11 100644 --- a/.github/workflows/tag-and-build.yml +++ b/.github/workflows/tag-and-build.yml @@ -94,15 +94,15 @@ jobs: - name: Build bundle and create PR in OpenShift community operators repository run: | - git config --global user.email "codeflare-ci@redhat.com" - git config --global user.name "CodeFlare CI" + git config --global user.email "138894154+codeflare-machine-account@users.noreply.github.com" + git config --global user.name "codeflare-machine-account" make openshift-community-operator-release env: VERSION: ${{ github.event.inputs.version }} 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 index ef3a05be..f1ff2de9 100644 --- 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 + 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)" --signoff && git push origin codeflare-release-$(BUNDLE_VERSION) + 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 From b4637f1ab7bc128d50f8c2c049460d099aed1836 Mon Sep 17 00:00:00 2001 From: anishasthana Date: Fri, 7 Jul 2023 16:00:26 +0000 Subject: [PATCH 2/2] Update dependency versions for release v0.0.5 --- Makefile | 4 ++-- README.md | 8 ++++---- controllers/defaults.go | 4 ++-- .../instascale_test_results/case_1/deployment.yaml | 2 +- .../instascale_test_results/case_2/deployment.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f1ff2de9..c0037f0e 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ VERSION ?= v0.0.0-dev BUNDLE_VERSION ?= $(VERSION:v%=%) # INSTASCALE_VERSION defines the default version of the InstaScale controller -INSTASCALE_VERSION ?= v0.0.4 +INSTASCALE_VERSION ?= v0.0.5 # MCAD_VERSION defines the default version of the MCAD controller -MCAD_VERSION ?= v1.31.0 +MCAD_VERSION ?= v1.32.0 # MCAD_REF, MCAD_REPO and MCAD_CRD define the reference to MCAD CRD resources MCAD_REF ?= release-${MCAD_VERSION} MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher diff --git a/README.md b/README.md index 5984017e..cacc7019 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ CodeFlare Stack Compatibility Matrix | Component | Version | |------------------------------|---------| -| CodeFlare Operator | v0.0.4 | -| Multi-Cluster App Dispatcher | v1.31.0 | -| CodeFlare-SDK | v0.4.4 | -| InstaScale | v0.0.4 | +| CodeFlare Operator | v0.0.5 | +| Multi-Cluster App Dispatcher | v1.32.0 | +| CodeFlare-SDK | v0.5.0 | +| InstaScale | v0.0.5 | | KubeRay | v0.5.0 | diff --git a/controllers/defaults.go b/controllers/defaults.go index d3cac3d0..4dc0b777 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -5,6 +5,6 @@ package controllers // *********************** const ( - MCADImage = "quay.io/project-codeflare/mcad-controller:release-v1.31.0" - InstaScaleImage = "quay.io/project-codeflare/instascale-controller:v0.0.4" + MCADImage = "quay.io/project-codeflare/mcad-controller:release-v1.32.0" + InstaScaleImage = "quay.io/project-codeflare/instascale-controller:v0.0.5" ) diff --git a/controllers/testdata/instascale_test_results/case_1/deployment.yaml b/controllers/testdata/instascale_test_results/case_1/deployment.yaml index 31c3896f..bb398dbb 100644 --- a/controllers/testdata/instascale_test_results/case_1/deployment.yaml +++ b/controllers/testdata/instascale_test_results/case_1/deployment.yaml @@ -19,7 +19,7 @@ spec: - name: instascale args: - "--configs-namespace=default" - image: quay.io/project-codeflare/instascale-controller:v0.0.4 + image: quay.io/project-codeflare/instascale-controller:v0.0.5 resources: limits: cpu: '2' diff --git a/controllers/testdata/instascale_test_results/case_2/deployment.yaml b/controllers/testdata/instascale_test_results/case_2/deployment.yaml index eb259ec8..ef7b8da1 100644 --- a/controllers/testdata/instascale_test_results/case_2/deployment.yaml +++ b/controllers/testdata/instascale_test_results/case_2/deployment.yaml @@ -19,7 +19,7 @@ spec: - name: instascale args: - "--configs-namespace=default" - image: quay.io/project-codeflare/instascale-controller:v0.0.4 + image: quay.io/project-codeflare/instascale-controller:v0.0.5 resources: limits: cpu: '1'