Skip to content

[CP 1283] GPUOP-618 fix helm upgrade issue with latest Argo CRDs#501

Merged
sajmera-pensando merged 2 commits intoROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.gpu-operator.1283.rocm.gpu-operator.main
Apr 3, 2026
Merged

[CP 1283] GPUOP-618 fix helm upgrade issue with latest Argo CRDs#501
sajmera-pensando merged 2 commits intoROCm:mainfrom
ci-penbot-01:CP.O2O.pensando.gpu-operator.1283.rocm.gpu-operator.main

Conversation

@ci-penbot-01
Copy link
Copy Markdown
Contributor

cp of pensando/gpu-operator#1283


Source PR Description (pensando/gpu-operator#1283):

The latest Argo Workflow CRDs exceed the 256 KB annotation size limit imposed by client-side kubectl apply. This causes CRD installation to fail during helm upgrade because client-side apply stores the entire resource manifest in the kubectl.kubernetes.io/last-applied-configuration annotation, which cannot accommodate the large Argo CRD schemas.

This PR switches the pre-upgrade hook to use server-side apply (--server-side --force-conflicts), eliminating the size constraint.

Cherrypick triggered by: ACP-Automation

(cherry picked from commit fe9ec91bcb097f1c82d51e6646e85d32e96096a9)
@ci-penbot-01
Copy link
Copy Markdown
Contributor Author

AI-Assisted Cherry-Pick

Source PR: #1283
Target Branch: main

The cherry-pick operation encountered merge conflicts which were resolved automatically using AI assistance.

Files with conflicts (resolved by AI):

  • bundle/manifests/amd-gpu-operator.clusterserviceversion.yaml:38-44
  • helm-charts-k8s/Chart.lock:12-16
Original conflict in bundle/manifests/amd-gpu-operator.clusterserviceversion.yaml
<<<<<<< HEAD
    containerImage: docker.io/rocm/amd-gpu-operator:dev
    createdAt: "2026-03-30T18:09:02Z"
=======
    containerImage: registry.test.pensando.io:5000/amd-gpu-operator:dev
    createdAt: "2026-04-02T12:26:30Z"
>>>>>>> fe9ec91b... GPUOP-618 fix helm upgrade issue with latest Argo CRDs (#1283)
Original conflict in helm-charts-k8s/Chart.lock
<<<<<<< HEAD
generated: "2026-03-27T12:42:32.543919608Z"
=======
generated: "2026-04-02T12:26:25.920315689Z"
>>>>>>> fe9ec91b... GPUOP-618 fix helm upgrade issue with latest Argo CRDs (#1283)

Cherry-pick triggered by: ACP-Automation

@sajmera-pensando sajmera-pensando merged commit 6705daa into ROCm:main Apr 3, 2026
3 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.

3 participants