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

[shivaprasad-metimath]

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.

• Resolves [CRAYSAT-1849]

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

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

[annapoorna-s-alt]

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