bundle-kubeflow icon indicating copy to clipboard operation
bundle-kubeflow copied to clipboard
verified publisher icon canonical

Create Gtihub branches for all rocks repositories (CKF 1.8 versions)

Open DnPlas opened this issue 1 year ago • 7 comments

Context

With the CKF 1.9 release coming soon, the rocks repositories are being updated to match the newer component versions. This is problematic because the code for CKF 1.8 components will be lost, making it impossible to maintain CKF 1.8 rocks.

What needs to get done

Create a track/<version>** Github branch in each rocks repository. The HEAD of the branch should be the last change made before upgrading the rock to its CKF 1.9 version.

** Format TBC

Definition of Done

  1. The rock repository has a track/<version> Github branch
  2. The main Github branch is not altered
  3. The publish job from the branch is not altered and can continue to publish rocks

DnPlas avatar Jun 07 '24 11:06 DnPlas

Thank you for reporting us your feedback!

The internal ticket has been created: https://warthogs.atlassian.net/browse/KF-5822.

This message was autogenerated

syncronize-issues-to-jira[bot] avatar Jun 07 '24 11:06 syncronize-issues-to-jira[bot]

Comment from @orfeas-k:

It may also be required to update the CI files, like this as the branch name would now be different.

DnPlas avatar Jun 07 '24 11:06 DnPlas

The relevant branches for CKF 1.8 for all rocks repositories are:

  • argo-workflows-rocks: track/3.3
  • dex-auth-rocks: track/2.36.0
  • filebrowser-rock: track/2.27.0
  • katib-rocks: track/0.16
  • kserve-rocks: track/0.11.2
  • kubeflow-rocks: track/1.8.0
  • metacontroller-rock: track/3.0.0
  • oidc-authservice-rock: track/cfk-1.8
  • pipelines-rocks: track/2.0
  • resource-displatcher-rock: track/1.0

mvlassis avatar Jul 04 '24 14:07 mvlassis

The relevant branches for CKF 1.8 for all rocks repositories are:

* `argo-workflows-rocks`: `track/3.3`

* `dex-auth-rocks`: `track/2.36.0`

* `filebrowser-rock`: `track/2.27.0`

* `katib-rocks`: `track/0.16`

* `kserve-rocks`: `track/0.11.2`

* `kubeflow-rocks`: `track/1.8.0`

* `metacontroller-rock`: `track/3.0.0`

* `oidc-authservice-rock`: `track/cfk-1.8`

* `pipelines-rocks`: `track/2.0`

* `resource-displatcher-rock`: `track/1.0`

Hey @mvlassis thanks for making the list, just a note, usually for charms we have the standard of track/<major>.<minor>, and I think we should follow this format here as well. For the ones that have the patch version, let's remove it:

  • dex-auth-rocks: track/2.36.0
  • filebrowser-rock: track/2.27.0
  • kserve-rocks: track/0.11.2
  • kubeflow-rocks: track/1.8.0
  • metacontroller-rock: track/3.0.0

DnPlas avatar Jul 04 '24 20:07 DnPlas

@DnPlas Thanks for the input, the updated version list is:

  • argo-workflows-rocks: track/3.3
  • dex-auth-rocks: track/2.36
  • filebrowser-rock: track/2.27
  • katib-rocks: track/0.16
  • kserve-rocks: track/0.11
  • kubeflow-rocks: track/1.8
  • metacontroller-rock: track/3.0
  • oidc-authservice-rock: track/cfk-1.8
  • pipelines-rocks: track/2.0
  • resource-displatcher-rock: track/1.0

mvlassis avatar Jul 05 '24 08:07 mvlassis

  • argo-workflows-rocks: track/3.3
    1. Looking at main history, the new branch should have been cut from this commit https://github.com/canonical/argo-workflows-rocks/pull/18. We should backport this thus.
    2. When backporting, remember to use merge commit, so we keep the commits in the branch's history.
  • dex-auth-rocks: track/2.36
    1. Should we close https://github.com/canonical/dex-auth-rocks/pull/16?
    2. I think we should delete and recut the branch since we don't want https://github.com/canonical/dex-auth-rocks/pull/12 in 2.36 branch. Instead, we 'd like to have https://github.com/canonical/dex-auth-rocks/pull/13.
    3. Let's delete 2.36.0 branch, since it's not needed. I think for that, you would need to modify branch protection rules against deletion for a bit, and then bring them back. Let me know if you need help with this.
  • filebrowser-rock: track/2.27
    1. Let's delete track/2.27.0
  • katib-rocks: track/0.16 LGTM
  • kserve-rocks: track/0.11
    1. Let's delete track/0.11.2
    2. LGTM
  • kubeflow-rocks: track/1.8
    1. Let's delete 1.8.0
    2. LGTM
  • metacontroller-rock: track/3.0
    1. Let's delete 3.0.0
  • oidc-authservice-rock: track/cfk-1.8 LGTM
  • pipelines-rocks: track/2.0 LGTM
  • resource-displatcher-rock: track/1.0 LGTM

orfeas-k avatar Jul 05 '24 09:07 orfeas-k

@orfeas-k Did the following:

  • argo-workflow-rocks: created (this PR) [https://github.com/canonical/argo-workflows-rocks/pull/26] for backporting the updating of argoexec.
  • dex-auth-rock: deleted the PR, deleted track/2.36.0, and recreated track/2.36 with the proper commits.
  • filebrowser-rock: deleted track/2.27.0.
  • kserve-rocks: deleted track/0.11.2.
  • kubeflow-rocks: deleted track/1.8.0.
  • metacontroller-rock: deleted track/3.0.0.

mvlassis avatar Jul 05 '24 11:07 mvlassis

Regarding that comment above:

It may also be required to update the CI files, like this as the branch name would now be different.

This is right since it is what is being used for integration tests in the CI. But at the moment, only seldonio-rocks repository has integration tests implemented, which was not part of this effort. Thus, we can omit this part since at the moment, we do not run any integration tests for the ROCKs.

Good job @mvlassis , LGTM

orfeas-k avatar Jul 08 '24 07:07 orfeas-k