Skip to content

Commit b8077b1

Browse files
committed
Merge remote-tracking branch 'kcp-dev/kcp-1.28' into kcp-1.28-1.17.2
2 parents d0396a3 + a1a470c commit b8077b1

26 files changed

+529
-124
lines changed

.prow.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
presubmits:
2+
- name: pull-controller-runtime-everything
3+
always_run: true
4+
decorate: true
5+
clone_uri: "ssh://[email protected]/kcp-dev/controller-runtime.git"
6+
labels:
7+
preset-goproxy: "true"
8+
spec:
9+
containers:
10+
- image: ghcr.io/kcp-dev/infra/build:1.20.9-1
11+
command:
12+
- make
13+
- test

DOWNSTREAM_OWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
approvers:
2+
- davidfestal
3+
- ncdc
4+
- stevekuznetsov
5+
- sttts
6+
reviewers:
7+
- fabianvf
8+
- varshaprasad96

DOWNSTREAM_OWNERS_ALIASES

Whitespace-only changes.

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,11 @@ $(GO_APIDIFF): $(TOOLS_DIR)/go.mod # Build go-apidiff from tools folder.
7373
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
7474
cd $(TOOLS_DIR) && go build -tags=tools -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
7575

76-
$(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golanci-lint using hack script into tools folder.
77-
hack/ensure-golangci-lint.sh \
78-
-b $(TOOLS_BIN_DIR) \
79-
$(shell cat .github/workflows/golangci-lint.yml | grep "version: v" | sed 's/.*version: //')
76+
$(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golangci-lint using hack script into tools folder.
77+
GOBIN=$(abspath $(TOOLS_BIN_DIR)) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(shell cat .github/workflows/golangci-lint.yml | grep "version: v" | sed 's/.*version: //')
78+
79+
.PHONY: tools
80+
tools: $(GO_APIDIFF) $(CONTROLLER_GEN) $(GOLANGCI_LINT)
8081

8182
## --------------------------------------
8283
## Linting

examples/scratch-env/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ require (
3232
github.com/imdario/mergo v0.3.6 // indirect
3333
github.com/josharian/intern v1.0.0 // indirect
3434
github.com/json-iterator/go v1.1.12 // indirect
35+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20230926071920-57d168bcbe34 // indirect
36+
github.com/kcp-dev/logicalcluster/v3 v3.0.4 // indirect
3537
github.com/mailru/easyjson v0.7.7 // indirect
3638
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
3739
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -63,7 +65,7 @@ require (
6365
k8s.io/component-base v0.29.0 // indirect
6466
k8s.io/klog/v2 v2.110.1 // indirect
6567
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
66-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
68+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
6769
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6870
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6971
sigs.k8s.io/yaml v1.4.0 // indirect

examples/scratch-env/go.sum

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
1010
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
11-
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
12-
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
11+
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
12+
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
1313
github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro=
1414
github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
1515
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -54,6 +54,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
5454
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
5555
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
5656
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
57+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20230926071920-57d168bcbe34 h1:tom0JX5OmAeOOmkGv8LaYHDtA1xAKDiQL5U0vhYYgdM=
58+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20230926071920-57d168bcbe34/go.mod h1:cWoaYGHl1nlzdEM2xvMzIASkEZJZLSf5nhe17M7wDhw=
59+
github.com/kcp-dev/logicalcluster/v3 v3.0.4 h1:q7KngML/QM7sWl8aVzmfZF0TPMnBwYNxsPKfwUvvBvU=
60+
github.com/kcp-dev/logicalcluster/v3 v3.0.4/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
5761
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
5862
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
5963
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -74,10 +78,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
7478
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7579
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7680
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
77-
github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
78-
github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw=
79-
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
80-
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
81+
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
82+
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
83+
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
84+
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
8185
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
8286
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
8387
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -105,8 +109,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
105109
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
106110
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
107111
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
108-
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
109-
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
112+
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
113+
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
110114
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
111115
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
112116
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -187,8 +191,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
187191
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
188192
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
189193
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
190-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
191-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
194+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
195+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
192196
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
193197
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
194198
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

go.mod

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,36 @@ go 1.21
55
toolchain go1.21.0
66

77
require (
8-
github.com/evanphx/json-patch v4.12.0+incompatible // Using v4 to match upstream
8+
github.com/evanphx/json-patch v5.6.0+incompatible // Using v4 to match upstream
99
github.com/evanphx/json-patch/v5 v5.8.0
1010
github.com/fsnotify/fsnotify v1.7.0
1111
github.com/go-logr/logr v1.4.1
1212
github.com/go-logr/zapr v1.3.0
1313
github.com/google/go-cmp v0.6.0
1414
github.com/google/gofuzz v1.2.0
15-
github.com/onsi/ginkgo/v2 v2.14.0
16-
github.com/onsi/gomega v1.30.0
17-
github.com/prometheus/client_golang v1.18.0
18-
github.com/prometheus/client_model v0.5.0
19-
go.uber.org/goleak v1.3.0
15+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20230926071920-57d168bcbe34
16+
github.com/kcp-dev/logicalcluster/v3 v3.0.4
17+
github.com/onsi/ginkgo/v2 v2.11.0
18+
github.com/onsi/gomega v1.27.10
19+
github.com/prometheus/client_golang v1.17.0
20+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16
21+
go.uber.org/goleak v1.2.1
2022
go.uber.org/zap v1.26.0
2123
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
2224
golang.org/x/sys v0.16.0
2325
gomodules.xyz/jsonpatch/v2 v2.4.0
24-
k8s.io/api v0.29.0
25-
k8s.io/apiextensions-apiserver v0.29.0
26-
k8s.io/apimachinery v0.29.0
27-
k8s.io/apiserver v0.29.0
28-
k8s.io/client-go v0.29.0
29-
k8s.io/component-base v0.29.0
30-
k8s.io/klog/v2 v2.110.1
31-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
32-
sigs.k8s.io/yaml v1.4.0
26+
k8s.io/api v0.28.1
27+
k8s.io/apiextensions-apiserver v0.28.0
28+
k8s.io/apimachinery v0.28.1
29+
k8s.io/apiserver v0.28.1
30+
k8s.io/client-go v0.28.1
31+
k8s.io/component-base v0.28.1
32+
k8s.io/klog/v2 v2.100.1
33+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
34+
sigs.k8s.io/yaml v1.3.0
3335
)
3436

3537
require (
36-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3738
github.com/beorn7/perks v1.0.1 // indirect
3839
github.com/blang/semver/v4 v4.0.0 // indirect
3940
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -49,7 +50,6 @@ require (
4950
github.com/gogo/protobuf v1.3.2 // indirect
5051
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5152
github.com/golang/protobuf v1.5.3 // indirect
52-
github.com/google/cel-go v0.17.7 // indirect
5353
github.com/google/gnostic-models v0.6.8 // indirect
5454
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5555
github.com/google/uuid v1.3.0 // indirect
@@ -66,7 +66,6 @@ require (
6666
github.com/prometheus/common v0.45.0 // indirect
6767
github.com/prometheus/procfs v0.12.0 // indirect
6868
github.com/spf13/pflag v1.0.5 // indirect
69-
github.com/stoewer/go-strcase v1.2.0 // indirect
7069
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
7170
go.opentelemetry.io/otel v1.19.0 // indirect
7271
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
@@ -91,8 +90,8 @@ require (
9190
gopkg.in/inf.v0 v0.9.1 // indirect
9291
gopkg.in/yaml.v2 v2.4.0 // indirect
9392
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
95-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
93+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
94+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
9695
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9796
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
9897
)

0 commit comments

Comments
 (0)