Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRAYSAT-1849: Update Python k8s version to the latest one supported i… #271

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

shivaprasad-metimath
Copy link
Contributor

@shivaprasad-metimath shivaprasad-metimath commented Oct 8, 2024

backport of #270

IM: CRAYSAT-1849
Reviewer: Ryan

Summary and Scope

  • CRAYSAT-1849: Update2 Python k8s version to the latest one supported in CSM 1.6

Issues and Related PRs

List and characterize relationship to Jira/Github issues and other pull requests. Be sure to list dependencies.

Testing

List the environments in which these changes were tested.

Tested on:

  • Starlord

Test description:

Check the PR

Risks and Mitigations

minimal

Pull Request Checklist

  • Version number(s) incremented, if applicable
  • Copyrights updated
  • License file intact
  • Target branch correct
  • CHANGELOG.md updated
  • Testing is appropriate and complete, if applicable
  • HPC Product Announcement prepared, if applicable

…n CSM 1.6 (#270)

* CRAYSAT-1849: Update2 Python k8s version to the latest one supported in CSM 1.6

IM: CRAYSAT-1849
Reviewer: Ryan
@annapoorna-s-alt
Copy link
Contributor

You should use user-defined-branch to target branch release/3.32 instead directly from main to release/3.32
I recommend to do fast forward. Here are the steps

git checkout main
git pull
git checkout release/3.32

simply merge main into release/3.32 . Use --ff-only option here to make sure it's just a fast-forward of the branch. By default, it will fast-forward if it can, so this option is not strictly necessary, but it can help ensure you don't make a mistake.
git merge --ff-only main

see that the HEAD of release/3.32 points at the same commit as the HEAD of main
git log --pretty=oneline -n 1

Once you confirmed, raise a PR with new branch

git checkout -b <user-defined-branch>
git branch --set-upstream-to=origin/release/3.32 <user-defined-branch>
git status

You would see similar message

Your branch is ahead of 'origin/release/3.32' by 'x' commits.
  (use "git push" to publish your local commits)

Then you can do git push to raise a PR

@shivaprasad-metimath shivaprasad-metimath merged commit 41a715e into release/3.32 Oct 9, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants