[CP 1302] change argo version from v3.6.5 to v4.0.3#516
Open
ci-penbot-01 wants to merge 1 commit intoROCm:mainfrom
Open
[CP 1302] change argo version from v3.6.5 to v4.0.3#516ci-penbot-01 wants to merge 1 commit intoROCm:mainfrom
ci-penbot-01 wants to merge 1 commit intoROCm:mainfrom
Conversation
* change argo version from v3.6.5 to v4.0.3 * using chart 1.0.5 for argo workflow version v4.0.3 (cherry picked from commit c2f1d8384b9900c9ddb9dd6e8f380cf06b05e613)
Contributor
Author
AI-Assisted Cherry-PickSource PR: #1302 The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance. Files with conflicts (resolved by AI):
Original conflict in tests/pytests/lib/autoremediation_util.pyCONFLICT: File deleted in HEAD but modified in incoming commit.
Incoming changes upgrade Argo Workflows version:
- Line 171: install_argo_crds(version: str = "v3.6.5") -> install_argo_crds(version: str = "v4.0.3")
- Lines 257-259: install_argo_workflows_helm defaults changed from argo_git_tag="v3.6.5", chart_version="0.41.1" to argo_git_tag="v4.0.3", chart_version="1.0.5"
RESOLUTION: Accept incoming changes (restore file with modifications)Original conflict in tests/pytests/openshift/conftest.pyCONFLICT: File deleted in HEAD but modified in incoming commit.
Incoming changes upgrade Argo Workflows Helm chart version:
- Line 245: chart_version changed from "0.48.2" to "1.0.5"
RESOLUTION: Accept incoming changes (restore file with modifications)Cherry-pick triggered by: ACP-Automation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cp of pensando/gpu-operator#1302