Skip to content

bump crossplane-runtime to v2.3.1 #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jschoombee wants to merge 6 commits into
base: main
Choose a base branch
from
+331 −298
Open

bump crossplane-runtime to v2.3.1 #664

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab80340
feat: migrate common API imports to crossplane/apis/v2 for runtime v2…
jschoombee May 31, 2026
bad62f0
ci: bump GO_VERSION to 1.25.10 to match crossplane-runtime v2.3.1 floor
jschoombee May 31, 2026
5c95371
chore: fix gci import grouping; regenerate mock; address review feedback
jschoombee May 31, 2026
c4a3781
docs: extend upjet-v2-upgrade guide with the v2.3 common-API migration
jschoombee May 31, 2026
8f76572
refactor: rename xpv1 alias to xpv2 for crossplane/apis/v2/core/v2
jschoombee Jun 8, 2026
7aa83b7
ci: use go-version-file: go.mod instead of pinning GO_VERSION
jschoombee Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
# Common versions
GO_VERSION: "1.25.8"
GO_VERSION: "1.25.10"

@fernandezcuesta fernandezcuesta Jun 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of the scope of this PR, but we can use go-version-file: go.mod in the setup-go action to avoid this coupling.

GOLANGCI_VERSION: "v2.10.1"
DOCKER_BUILDX_VERSION: "v0.28.0"

Expand Down
32 changes: 32 additions & 0 deletions docs/upjet-v2-upgrade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,38 @@ github.com/crossplane/crossplane-runtime/ => github.com/crossplane/crossplane-ru
github.com/crossplane/upjet/ => github.com/crossplane/upjet/v2/
```

> **Adopting `crossplane-runtime` v2.3.x or newer?**
>
> `crossplane-runtime` v2.3.0 relocated the common APIs out of
> `crossplane-runtime/v2/apis/common/{v1,v2}` (and the unversioned
> `apis/common` sub-package used by mock surfaces) into a single
> consolidated package at
> `github.com/crossplane/crossplane/apis/v2/core/v2`. Two type embeds were
> also renamed:
>
> - `xpv1.ResourceSpec` → `xpv2.ClusterManagedResourceSpec` (cluster-scoped MRs)
> - `xpv1.ResourceStatus` → `xpv2.ManagedResourceStatus`
>
> The other public symbols (`Reference`, `Selector`, `SecretReference`,
> `SecretKeySelector`, `LocalSecretReference`, `LocalSecretKeySelector`,
> `NamespacedReference`, `NamespacedSelector`, `Condition*`,
> `ManagementAction*`, `ManagementPolicies`, `DeletionPolicy`) kept their
> names — only the import path changes.
>
> For a provider already on Upjet v2, the upgrade is two steps:
>
> 1. In `go.mod` bump `github.com/crossplane/crossplane-runtime/v2` to
> `v2.3.x` and add a direct require on
> `github.com/crossplane/crossplane/apis/v2 v2.3.x`. Run `go mod tidy`.
> 2. Run `make generate`. Upjet's code generator emits the new package
> path and type names automatically for all your generated `zz_*.go`
> files. Any hand-written code that imports `crossplane-runtime/v2/apis/common/{v1,v2}`
> needs its import path updated to the consolidated package.
>
> If you have generated `zz_*.go` files committed and you're not ready to
> regenerate yet, you can also bulk-rewrite the import paths and the two
> renamed embeds with `sed`.

### Remove External Secret Store (ESS)-related APIs

- in `apis/v1alpha1` remove `StoreConfig` api types and registration
Expand Down
58 changes: 29 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

module github.com/crossplane/upjet/v2

go 1.25.8
go 1.25.10

require (
dario.cat/mergo v1.0.2
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/antchfx/htmlquery v1.2.4
github.com/crossplane/crossplane-runtime/v2 v2.2.0
github.com/crossplane/crossplane-runtime/v2 v2.3.1
github.com/crossplane/crossplane/apis/v2 v2.3.1
github.com/fatih/camelcase v1.0.0
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.7.0
Expand All @@ -33,8 +34,8 @@ require (
github.com/yuin/goldmark v1.7.16
github.com/zclconf/go-cty v1.16.2
github.com/zclconf/go-cty-yaml v1.0.3
golang.org/x/net v0.49.0
golang.org/x/tools v0.41.0
golang.org/x/net v0.54.0
golang.org/x/tools v0.44.0
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -55,7 +56,6 @@ require (
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
Expand All @@ -67,20 +67,20 @@ require (
github.com/getkin/kin-openapi v0.133.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
github.com/go-openapi/swag/loading v0.25.4 // indirect
github.com/go-openapi/swag/mangling v0.25.4 // indirect
github.com/go-openapi/swag/netutils v0.25.4 // indirect
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/jsonreference v0.21.5 // indirect
github.com/go-openapi/swag v0.25.5 // indirect
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
github.com/go-openapi/swag/conv v0.25.5 // indirect
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
github.com/go-openapi/swag/loading v0.25.5 // indirect
github.com/go-openapi/swag/mangling v0.25.5 // indirect
github.com/go-openapi/swag/netutils v0.25.5 // indirect
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
Expand Down Expand Up @@ -133,23 +133,23 @@ require (
github.com/x448/float16 v0.8.4 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/yargevad/filepathx v1.0.0 // indirect
go.opentelemetry.io/otel v1.41.0 // indirect
go.opentelemetry.io/otel/trace v1.41.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/mod v0.32.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/term v0.43.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260316180232-0b37fe3546d5 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
Expand Down
Loading