From 354c9ae003c4c0d3f6c0512fc4ee3aa4f6285bc7 Mon Sep 17 00:00:00 2001 From: Ruben Vargas Date: Tue, 21 Nov 2023 10:57:37 -0600 Subject: [PATCH 1/3] Fix operatorhub works, add one to trigger manual (#693) * Fix operatorhub works, add one to trigger manual Signed-off-by: Ruben Vargas * Update .github/workflows/reusable-operator-hub-release.yaml Co-authored-by: Andreas Gerstmayr --------- Signed-off-by: Ruben Vargas Co-authored-by: Andreas Gerstmayr --- .github/workflows/olm.yaml | 30 +++++++++++++++++++ .github/workflows/release.yaml | 2 ++ .../reusable-operator-hub-release.yaml | 6 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/olm.yaml diff --git a/.github/workflows/olm.yaml b/.github/workflows/olm.yaml new file mode 100644 index 000000000..dc77b9a5e --- /dev/null +++ b/.github/workflows/olm.yaml @@ -0,0 +1,30 @@ +name: "Publish to operatorHUB" +on: + workflow_dispatch: + inputs: + version: + description: version of the operator to publish + required: true + +jobs: + operator-hub-prod-release: + uses: ./.github/workflows/reusable-operator-hub-release.yaml + with: + org: redhat-openshift-ecosystem + repo: community-operators-prod + branch: releases/${{inputs.version}} + oprepo: ${{ github.repository }} + bundletype: openshift + secrets: + TEMPOOPERATORBOT_GITHUB_TOKEN: ${{ secrets.TEMPOOPERATORBOT_GITHUB_TOKEN }} + + operator-hub-community-release: + uses: ./.github/workflows/reusable-operator-hub-release.yaml + with: + org: k8s-operatorhub + repo: community-operators + branch: $ releases/${{inputs.version}} + oprepo: ${{ github.repository }} + bundletype: community + secrets: + TEMPOOPERATORBOT_GITHUB_TOKEN: ${{ secrets.TEMPOOPERATORBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 46f42c222..6b888e753 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -53,6 +53,7 @@ jobs: repo: community-operators-prod branch: ${{ github.event.pull_request.head.ref }} oprepo: ${{ github.repository }} + bundletype: openshift secrets: TEMPOOPERATORBOT_GITHUB_TOKEN: ${{ secrets.TEMPOOPERATORBOT_GITHUB_TOKEN }} @@ -64,5 +65,6 @@ jobs: repo: community-operators branch: ${{ github.event.pull_request.head.ref }} oprepo: ${{ github.repository }} + bundletype: community secrets: TEMPOOPERATORBOT_GITHUB_TOKEN: ${{ secrets.TEMPOOPERATORBOT_GITHUB_TOKEN }} diff --git a/.github/workflows/reusable-operator-hub-release.yaml b/.github/workflows/reusable-operator-hub-release.yaml index fdefae762..52e08a588 100644 --- a/.github/workflows/reusable-operator-hub-release.yaml +++ b/.github/workflows/reusable-operator-hub-release.yaml @@ -15,6 +15,9 @@ on: oprepo: type: string required: true + bundletype: + type: string + required: true secrets: TEMPOOPERATORBOT_GITHUB_TOKEN: required: true @@ -56,9 +59,10 @@ jobs: - name: Update version env: VERSION: ${{ steps.operator-version.outputs.version }} + BUNDLE_TYPE: ${{ inputs.bundletype }} run: | mkdir operators/tempo-operator/${VERSION} - cp -R ./tmp/bundle/* operators/tempo-operator/${VERSION} + cp -R ./tmp/bundle/${BUNDLE_TYPE}/* operators/tempo-operator/${VERSION} rm -rf ./tmp - name: Use CLA approved github bot From 1201d97ef405f23fe055c835f4a9dd73216c701d Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Tue, 21 Nov 2023 18:14:31 +0100 Subject: [PATCH 2/3] fix typo in OLM workflow (#694) Signed-off-by: Andreas Gerstmayr --- .github/workflows/olm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/olm.yaml b/.github/workflows/olm.yaml index dc77b9a5e..b393b96b1 100644 --- a/.github/workflows/olm.yaml +++ b/.github/workflows/olm.yaml @@ -23,7 +23,7 @@ jobs: with: org: k8s-operatorhub repo: community-operators - branch: $ releases/${{inputs.version}} + branch: releases/${{inputs.version}} oprepo: ${{ github.repository }} bundletype: community secrets: From 2f6c91de15412a80c1d1ebfea99973929b59333d Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Tue, 21 Nov 2023 18:22:20 +0100 Subject: [PATCH 3/3] Fix tempooperatorbot mail address (#695) https://api.github.com/users/tempooperatorbot Signed-off-by: Andreas Gerstmayr --- .github/workflows/reusable-operator-hub-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-operator-hub-release.yaml b/.github/workflows/reusable-operator-hub-release.yaml index 52e08a588..620bb4dd8 100644 --- a/.github/workflows/reusable-operator-hub-release.yaml +++ b/.github/workflows/reusable-operator-hub-release.yaml @@ -68,7 +68,7 @@ jobs: - name: Use CLA approved github bot run: | git config user.name tempobot - git config user.email 107717825+grafana@users.noreply.github.com + git config user.email 150731540+grafana@users.noreply.github.com - name: Create pull request against ${{ inputs.org }}/${{ inputs.repo }} env: