[CP 1597] fix(deps): bump k8s.io to v0.36.2 and controller-runtime to v0.24.1#601
Merged
spraveenio merged 2 commits intoJul 11, 2026
Conversation
…#1597) * fix(deps): bump k8s.io to v0.36.2 and controller-runtime to v0.24.1 Update all k8s.io/* packages from v0.33.1 to v0.36.2 (Kubernetes 1.36.2) and sigs.k8s.io/controller-runtime from v0.20.3 to v0.24.1 to remediate CVE in bundled kubectl/k8s.io libraries. Also pin kubectl binary in Dockerfile.build from v1.30.4 to v1.36.2, aligning the build container with the current stable kubectl release. MockClient updated to implement the Apply() method added to client.Client in controller-runtime v0.22 as part of native SSA support. Plan: docs-internal/knowledge/plans/2026-07-10-k8s-dependency-bump-v0.36.2.md Co-Authored-By: Claude <noreply@anthropic.com> * fix(lint): resolve SA1019 deprecation warnings from k8s.io v0.36.2 bump - Replace scheme.Builder with runtime.SchemeBuilder in api/v1alpha1 to fix the controller-runtime v0.24 deprecation of scheme.Builder - Replace result.Requeue check with result.RequeueAfter > 0 in remediation_handler.go per controller-runtime v0.21 deprecation Co-Authored-By: Claude <noreply@anthropic.com> * fix(scheme): restore metav1.AddToGroupVersion for amd.com/v1alpha1 The SA1019 lint cleanup (182be5a9) migrated api/v1alpha1 from controller-runtime scheme.Builder to a bare runtime.SchemeBuilder, dropping the metav1.AddToGroupVersion call that scheme.Builder.Register performed implicitly. Without it, ListOptions/GetOptions conversions for the group are unregistered and the controller-manager cannot list/watch its own DeviceConfig CRD: v1.ListOptions is not suitable for converting to "amd.com/v1alpha1" This crash-loops the manager, blocks Deployment availability, fails E2ESuite.SetUpSuite, and cascades into 8 failed / 4 crashed e2e chunks. Re-add metav1.AddToGroupVersion(s, GroupVersion) in both registration funcs, preserving the lint fix while restoring runtime behavior. Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> (cherry picked from commit 40e9881c17f97e4ca39fbf5dcdfa77b4839bb682)
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
3 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#1597
Source PR Description (pensando/gpu-operator#1597):
Summary
k8s.io/*packages fromv0.33.1→v0.36.2(Kubernetes 1.36.2) to remediate CVE in bundled kubectl/k8s.io librariessigs.k8s.io/controller-runtimefromv0.20.3→v0.24.1(required — v0.24.x is the first release targeting k8s.io v0.36.x)kubectlbinary inDockerfile.buildfromv1.30.4→v1.36.2, aligning the build container with the current stable releaseApply()method toMockClientto satisfy the newclient.Clientinterface introduced in controller-runtime v0.22Breaking changes evaluated
Result.Requeuedeprecated (v0.21)client.Client.Applyadded (v0.22)MockClientupdateMatchingLabelsSelector/MatchingFieldsSelectorusage in operator sourceTest Plan
go build ./...passesgo test ./internal/...passes (all unit tests green)Plan
Plan: docs-internal/knowledge/plans/2026-07-10-k8s-dependency-bump-v0.36.2.md
🤖 Generated with Claude Code
Cherrypick triggered by: ACP-Automation