Skip to content

Kcp 0.29 #124

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

Draft
xrstf wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Kcp 0.29 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
563411a
update codebase to kcp 0.29
xrstf Dec 3, 2025
5b73e8b
bump all golang.org/x/ modules
xrstf Dec 3, 2025
36b3e38
handle multicluster-provider still being on kcp 0.28's SDK module
xrstf Dec 3, 2025
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
6 changes: 3 additions & 3 deletions cmd/api-syncagent/kcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

"github.com/kcp-dev/api-syncagent/internal/kcp"

kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
kcpdevcore "github.com/kcp-dev/kcp/sdk/apis/core"
kcpdevcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
kcpdevcore "github.com/kcp-dev/sdk/apis/core"
kcpdevcorev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"

"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion cmd/api-syncagent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/kcp-dev/api-syncagent/internal/version"
syncagentv1alpha1 "github.com/kcp-dev/api-syncagent/sdk/apis/syncagent/v1alpha1"

kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
kcpdevv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"

corev1 "k8s.io/api/core/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down
58 changes: 28 additions & 30 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.24.0
replace github.com/kcp-dev/api-syncagent/sdk => ./sdk

replace (
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250821202322-e42d885de52b
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250821202322-e42d885de52b
k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20251113163256-f038ec6bf609
k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20251113163256-f038ec6bf609
)

require (
Expand All @@ -16,32 +16,28 @@ require (
github.com/go-logr/zapr v1.3.0
github.com/google/go-cmp v0.7.0
github.com/kcp-dev/api-syncagent/sdk v0.0.0-00010101000000-000000000000
github.com/kcp-dev/kcp v0.28.1
github.com/kcp-dev/kcp/sdk v0.28.1
github.com/kcp-dev/kcp v0.29.0
github.com/kcp-dev/logicalcluster/v3 v3.0.5
github.com/kcp-dev/multicluster-provider v0.2.1-0.20250901093233-9ef571c8bd47
github.com/kcp-dev/sdk v0.29.0
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.10
github.com/tidwall/gjson v1.18.0
github.com/tidwall/sjson v1.2.5
go.uber.org/zap v1.27.0
go.uber.org/zap v1.27.1
k8c.io/reconciler v0.5.0
// Deviating from kcp's kube version (0.32) because more recent multicluster-runtime
// versions are built ontop of controller-runtime 0.21 with Kube 0.33. Ideally in
// the future we should go back to having kcp, controller-runtime and multicluster-runtime
// be in-sync again.
k8s.io/api v0.33.4
k8s.io/apiextensions-apiserver v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/apiserver v0.33.4
k8s.io/client-go v0.33.4
k8s.io/component-base v0.33.4
k8s.io/api v0.33.5
k8s.io/apiextensions-apiserver v0.33.5
k8s.io/apimachinery v0.33.5
k8s.io/apiserver v0.33.5
k8s.io/client-go v0.33.5
k8s.io/component-base v0.33.5
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.21.0
sigs.k8s.io/multicluster-runtime v0.21.0-alpha.9
sigs.k8s.io/yaml v1.4.0
sigs.k8s.io/yaml v1.6.0
)

require (
Expand Down Expand Up @@ -91,8 +87,9 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 // indirect
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b // indirect
github.com/kcp-dev/apimachinery/v2 v2.29.0 // indirect
github.com/kcp-dev/client-go v0.29.0 // indirect
github.com/kcp-dev/kcp/sdk v0.28.1 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mailru/easyjson v0.9.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down Expand Up @@ -126,16 +123,17 @@ require (
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.29.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.33.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
Expand All @@ -144,10 +142,10 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-helpers v0.32.3 // indirect
k8s.io/controller-manager v0.32.3 // indirect
k8s.io/component-helpers v0.33.5 // indirect
k8s.io/controller-manager v0.33.5 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kubernetes v1.33.3 // indirect
k8s.io/kubernetes v1.33.5 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
Expand Down
Loading