DO-NOT-MERGE: smash-and-grab of #522 + #523 + #524 to probe CI#526
Closed
frobware wants to merge 3 commits into
Closed
DO-NOT-MERGE: smash-and-grab of #522 + #523 + #524 to probe CI#526frobware wants to merge 3 commits into
frobware wants to merge 3 commits into
Conversation
- Bump the core k8s.io modules (`api`, `apimachinery`, `client-go`, `code-generator`, `cri-api`) from `v0.34.3` to `v0.35.4`. - Bump `sigs.k8s.io/controller-runtime` from `v0.22.4` to `v0.23.3`, which is the release aligned with k8s `0.35`. Indirect k8s dependencies (`apiextensions-apiserver`, `apiserver`, `component-base`) are also aligned to `v0.35.4`. - Bump `sigs.k8s.io/controller-tools` from `v0.17.1` to `v0.20.1`, the release aligned with k8s `0.35`. - Migrate from deprecated `SchemeGroupVersion` to `GroupVersion` in test files. `setup-envtest` is left at its current pseudo-version as the only tagged release (`v0.24.0`) requires Go `1.26`. Co-Authored-By: Claude Signed-off-by: Andrey Lebedev <alebedev@redhat.com>
Move kustomize to `tools/tools.go` and use `go run` for invocation, consistent with how `controller-gen`, `client-gen`, and other tools are already managed. This replaces the curl-based install script that downloaded a prebuilt binary into `bin/`. The `KUSTOMIZE_VERSION`, `KUSTOMIZE_INSTALL_SCRIPT`, and the `kustomize` Makefile target are removed. All targets that depended on the `kustomize` prerequisite are updated since `go run` handles tool resolution automatically. Co-Authored-By: Claude Signed-off-by: Andrey Lebedev <alebedev@redhat.com>
Bump `operator-sdk` to `v1.37.0` which is the latest version that still supports the `go.kubebuilder.io/v3` project layout used by this project. Starting from `v1.38.0` `operator-sdk` dropped `go/v3` support entirely, requiring migration to `go.kubebuilder.io/v4`. Bump `golangci-lint` to `v2.12.2`. Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Andrey Lebedev <alebedev@redhat.com>
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.
This is a smash-and-grab combined branch of #522, #523, and #524, cherry-picked on top of
mainto see whether the future state -- once all three land -- builds and passes CI. Not intended for merge; please leave any substantive feedback on the underlying PRs.I cherry-picked the single commit from each PR in number order (522 -> 523 -> 524) and resolved conflicts pragmatically. In
go.mod, 522 and 523 collide oncontroller-toolsandmoby/spdystream; I kept the higher version from 522 in both cases and added 523's new kustomize-side dependencies, then rango mod tidyandgo mod vendorto settle the indirect set and refreshvendor/. In theMakefile, 524's commit re-introduced theKUSTOMIZE_VERSION ?= v3.8.7line because its base predates 523's removal, so I dropped that line and kept only theOPERATOR_SDK_VERSIONbump tov1.37.0. ThecreatedAttimestamp inbundle/manifests/bpfman-operator.clusterserviceversion.yamlwas trivially conflicted; I took 524's value since it will be regenerated bymake bundleanyway.go build ./...is clean locally. Whatever the CI surfaces here is the actual answer to "do these three land cleanly together"; merge-order conflicts ingo.mod/go.sumare otherwise the most obvious bear-trap when they each go in individually.Underlying PRs: #522, #523, #524.