diff --git a/.github/workflows/sync-branches-through-py.yaml b/.github/workflows/sync-branches-through-py.yaml new file mode 100644 index 00000000000..d08ab05607f --- /dev/null +++ b/.github/workflows/sync-branches-through-py.yaml @@ -0,0 +1,47 @@ +--- +name: Sync branches through Pull Request + +on: # yamllint disable-line rule:truthy + workflow_dispatch: + inputs: + source: + description: Source branch + required: true + target: + description: Target branch + required: true + +jobs: + sync: + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ github.event.inputs.target }} + fetch-depth: 0 + + - name: Prepare sync branch + id: prepare + run: | + git fetch origin ${{ github.event.inputs.source }} + git reset --hard origin/${{ github.event.inputs.source }} + + TIMESTAMP=$(date +'%Y%m%d%H%M%S') + SYNC_BRANCH=sync__${{ github.event.inputs.source }}__${{ github.event.inputs.target }}__${TIMESTAMP} + echo "branch=$SYNC_BRANCH" >> $GITHUB_OUTPUT + + - name: Create pull request + uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 + with: + branch: ${{ steps.prepare.outputs.branch }} + title: "Sync `${{ github.event.inputs.target }}` branch with `${{ github.event.inputs.source }}` branch" + body: | + :robot: This is an automated Pull Request created by `/.github/workflows/sync-branches-through-pr.yml`. + + It merges all commits from `${{ github.event.inputs.source }}` branch into `${{ github.event.inputs.target }}` branch. + + :warning: **IMPORTANT NOTE**: Remember to delete the `${{ steps.prepare.outputs.branch }}` branch after merging the changes. diff --git a/components/notebook-controller/config/overlays/openshift/params.env b/components/notebook-controller/config/overlays/openshift/params.env index 2ef1d1a2450..4aff427b099 100644 --- a/components/notebook-controller/config/overlays/openshift/params.env +++ b/components/notebook-controller/config/overlays/openshift/params.env @@ -1 +1 @@ -odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:stable +odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:1.9-fa442a1 diff --git a/components/odh-notebook-controller/Makefile b/components/odh-notebook-controller/Makefile index 558daa7a7db..345cb316724 100644 --- a/components/odh-notebook-controller/Makefile +++ b/components/odh-notebook-controller/Makefile @@ -4,7 +4,7 @@ IMG ?= quay.io/opendatahub/odh-notebook-controller TAG ?= $(shell git describe --tags --always) KF_IMG ?= quay.io/opendatahub/kubeflow-notebook-controller -KF_TAG ?= 1.9-1769b4b +KF_TAG ?= 1.9-fa442a1 CONTAINER_ENGINE ?= podman diff --git a/components/odh-notebook-controller/config/base/params.env b/components/odh-notebook-controller/config/base/params.env index 26e5d3cce87..f6fda5e078f 100644 --- a/components/odh-notebook-controller/config/base/params.env +++ b/components/odh-notebook-controller/config/base/params.env @@ -1 +1 @@ -odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:stable +odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:1.9-fa442a1