Skip to content

Commit d8be561

Browse files
authored
Merge pull request #32 from embik/kcp-0.28
Update to kcp 0.28.0
2 parents 801f1e7 + 215b1d1 commit d8be561

File tree

7 files changed

+154
-166
lines changed

7 files changed

+154
-166
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ $(YQ):
7373
yq_*
7474

7575
KCP = _tools/kcp
76-
KCP_VERSION = 0.27.1
76+
KCP_VERSION = 0.28.0
7777

7878
.PHONY: $(KCP)
7979
$(KCP):

envtest/workspaces.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func WithLocation(w tenancyv1alpha1.WorkspaceLocation) WorkspaceOption {
7575
// WithType sets the type of the workspace.
7676
func WithType(path logicalcluster.Path, name tenancyv1alpha1.WorkspaceTypeName) WorkspaceOption {
7777
return func(ws *tenancyv1alpha1.Workspace) {
78-
ws.Spec.Type = tenancyv1alpha1.WorkspaceTypeReference{
78+
ws.Spec.Type = &tenancyv1alpha1.WorkspaceTypeReference{
7979
Name: name,
8080
Path: path.String(),
8181
}
@@ -110,7 +110,7 @@ func NewWorkspaceFixture(t TestingT, clusterClient kcpclient.ClusterClient, pare
110110
GenerateName: "e2e-workspace-",
111111
},
112112
Spec: tenancyv1alpha1.WorkspaceSpec{
113-
Type: tenancyv1alpha1.WorkspaceTypeReference{
113+
Type: &tenancyv1alpha1.WorkspaceTypeReference{
114114
Name: tenancyv1alpha1.WorkspaceTypeName("universal"),
115115
Path: "root",
116116
},
@@ -183,7 +183,7 @@ func NewInitializingWorkspaceFixture(t TestingT, clusterClient kcpclient.Cluster
183183
GenerateName: "e2e-workspace-",
184184
},
185185
Spec: tenancyv1alpha1.WorkspaceSpec{
186-
Type: tenancyv1alpha1.WorkspaceTypeReference{
186+
Type: &tenancyv1alpha1.WorkspaceTypeReference{
187187
Name: tenancyv1alpha1.WorkspaceTypeName("universal"),
188188
Path: "root",
189189
},

go.mod

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@ go 1.23.5
55
require (
66
github.com/go-logr/logr v1.4.2
77
github.com/hashicorp/golang-lru/v2 v2.0.7
8-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250223115924-431177b024f3
9-
github.com/kcp-dev/kcp/sdk v0.27.1
8+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077
9+
github.com/kcp-dev/kcp/sdk v0.28.0
1010
github.com/kcp-dev/logicalcluster/v3 v3.0.5
1111
github.com/martinlindhe/base36 v1.1.1
12-
github.com/onsi/ginkgo/v2 v2.22.0
13-
github.com/onsi/gomega v1.36.1
14-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
12+
github.com/onsi/ginkgo/v2 v2.22.1
13+
github.com/onsi/gomega v1.36.2
14+
github.com/spf13/pflag v1.0.6
1515
github.com/stretchr/testify v1.10.0
16-
golang.org/x/sync v0.11.0
17-
golang.org/x/sys v0.30.0
16+
go.uber.org/zap v1.27.0
17+
golang.org/x/sync v0.13.0
18+
golang.org/x/sys v0.32.0
1819
k8s.io/api v0.32.3
19-
k8s.io/apiextensions-apiserver v0.32.1
20+
k8s.io/apiextensions-apiserver v0.32.3
2021
k8s.io/apimachinery v0.32.3
2122
k8s.io/client-go v0.32.3
2223
k8s.io/klog/v2 v2.130.1
23-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
24+
k8s.io/utils v0.0.0-20241210054802-24370beab758
2425
sigs.k8s.io/controller-runtime v0.20.4
2526
sigs.k8s.io/multicluster-runtime v0.20.4-alpha.7
2627
sigs.k8s.io/yaml v1.4.0
@@ -30,51 +31,50 @@ require (
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3233
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
34+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3435
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3536
github.com/fsnotify/fsnotify v1.7.0 // indirect
3637
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3738
github.com/go-logr/zapr v1.3.0 // indirect
3839
github.com/go-openapi/jsonpointer v0.21.0 // indirect
39-
github.com/go-openapi/jsonreference v0.20.2 // indirect
40+
github.com/go-openapi/jsonreference v0.21.0 // indirect
4041
github.com/go-openapi/swag v0.23.0 // indirect
4142
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4243
github.com/gogo/protobuf v1.3.2 // indirect
4344
github.com/golang/protobuf v1.5.4 // indirect
4445
github.com/google/btree v1.1.3 // indirect
45-
github.com/google/gnostic-models v0.6.8 // indirect
46-
github.com/google/go-cmp v0.6.0 // indirect
46+
github.com/google/gnostic-models v0.6.9 // indirect
47+
github.com/google/go-cmp v0.7.0 // indirect
4748
github.com/google/gofuzz v1.2.0 // indirect
48-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
49+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4950
github.com/google/uuid v1.6.0 // indirect
5051
github.com/josharian/intern v1.0.0 // indirect
5152
github.com/json-iterator/go v1.1.12 // indirect
52-
github.com/mailru/easyjson v0.7.7 // indirect
53+
github.com/klauspost/compress v1.17.11 // indirect
54+
github.com/mailru/easyjson v0.9.0 // indirect
5355
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5456
github.com/modern-go/reflect2 v1.0.2 // indirect
5557
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5658
github.com/pkg/errors v0.9.1 // indirect
5759
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
58-
github.com/prometheus/client_golang v1.19.1 // indirect
60+
github.com/prometheus/client_golang v1.20.5 // indirect
5961
github.com/prometheus/client_model v0.6.1 // indirect
60-
github.com/prometheus/common v0.55.0 // indirect
62+
github.com/prometheus/common v0.61.0 // indirect
6163
github.com/prometheus/procfs v0.15.1 // indirect
6264
github.com/x448/float16 v0.8.4 // indirect
6365
go.uber.org/multierr v1.11.0 // indirect
64-
go.uber.org/zap v1.27.0 // indirect
65-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
66-
golang.org/x/net v0.36.0 // indirect
67-
golang.org/x/oauth2 v0.25.0 // indirect
68-
golang.org/x/term v0.29.0 // indirect
69-
golang.org/x/text v0.22.0 // indirect
70-
golang.org/x/time v0.9.0 // indirect
71-
golang.org/x/tools v0.29.0 // indirect
66+
golang.org/x/net v0.39.0 // indirect
67+
golang.org/x/oauth2 v0.29.0 // indirect
68+
golang.org/x/term v0.31.0 // indirect
69+
golang.org/x/text v0.24.0 // indirect
70+
golang.org/x/time v0.11.0 // indirect
71+
golang.org/x/tools v0.32.0 // indirect
7272
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
73-
google.golang.org/protobuf v1.35.1 // indirect
73+
google.golang.org/protobuf v1.36.2 // indirect
7474
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7575
gopkg.in/inf.v0 v0.9.1 // indirect
7676
gopkg.in/yaml.v3 v3.0.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
78-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
79-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
77+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
78+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
79+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
8080
)

0 commit comments

Comments
 (0)