[CP 1329] Fix helm e2e test for remediation workflow ConfigMapImage field#520
Open
ci-penbot-01 wants to merge 1 commit intoROCm:mainfrom
Open
Conversation
The test "upgrade with rendering spec.remediationWorkflow" was failing because it didn't expect the ConfigMapImage field in the DeviceConfigSpec. The helm chart sets a default value for configMapImage in values.yaml, which gets rendered into the DeviceConfig CR. Updated the expected spec to include the ConfigMapImage field with the default value from the helm chart. Also added E2E_ANR_CONFIGMAP_IMAGE to the e2e test Makefile for consistency with other configurable image variables. Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> (cherry picked from commit d24f89f246581892a281bc689d9107a0917438f2)
Contributor
Author
AI-Assisted Cherry-PickSource PR: #1329 The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance. Files with conflicts (resolved by AI):
Original conflict in hack/k8s-patch/metadata-patch/values.yaml<<<<<<< HEAD
=======
# -- Container image used to create the remediation ConfigMap. This image contains the default remediation ConfigMap configmap.yaml file.
configMapImage: ""
>>>>>>> d24f89f2Original conflict in helm-charts-k8s/README.md<<<<<<< HEAD
## gpu-operator-charts
=======
>>>>>>> d24f89f2Original conflict in helm-charts-k8s/README.md<<<<<<< HEAD
=======
| deviceConfig.spec.remediationWorkflow.configMapImage | string | `""` | Container image used to create the remediation ConfigMap. This image contains the default remediation ConfigMap configmap.yaml file. |
>>>>>>> d24f89f2Original conflict in helm-charts-k8s/values.yaml<<<<<<< HEAD
=======
# -- Container image used to create the remediation ConfigMap. This image contains the default remediation ConfigMap configmap.yaml file.
configMapImage: ""
>>>>>>> d24f89f2Cherry-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#1329
Source PR Description (pensando/gpu-operator#1329):
The test "upgrade with rendering spec.remediationWorkflow" was failing because it didn't expect the ConfigMapImage field in the DeviceConfigSpec. The helm chart sets a default value for configMapImage in values.yaml, which gets rendered into the DeviceConfig CR.
Updated the expected spec to include the ConfigMapImage field with the default value from the helm chart.
Also added E2E_ANR_CONFIGMAP_IMAGE to the e2e test Makefile for consistency with other configurable image variables.
Cherrypick triggered by: ACP-Automation