Skip to content

Commit 9a5e0c7

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #3307 from gman0/1.31.6-pre.3-clean
✨ Updates for Kubernetes v1.31.6
2 parents 40dd2c0 + e783d7d commit 9a5e0c7

File tree

106 files changed

+259
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+259
-526
lines changed

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ else
4040
INSTALL_GOBIN=$(shell go env GOBIN)
4141
endif
4242

43-
CONTROLLER_GEN_VER := v0.16.1
43+
CONTROLLER_GEN_VER := v0.16.5
4444
CONTROLLER_GEN_BIN := controller-gen
4545
CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
4646
export CONTROLLER_GEN # so hack scripts can use it
@@ -72,7 +72,7 @@ LOGCHECK_BIN := logcheck
7272
LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
7373
export LOGCHECK # so hack scripts can use it
7474

75-
CODE_GENERATOR_VER := v2.3.0
75+
CODE_GENERATOR_VER := f78b79a2f905778087cbd266cda10d47997f0bdf
7676
CODE_GENERATOR_BIN := code-generator
7777
CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER)
7878
export CODE_GENERATOR # so hack scripts can use it

‎cli/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ go 1.22.0
44

55
require (
66
github.com/google/go-cmp v0.6.0
7-
github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e
7+
github.com/kcp-dev/client-go v0.0.0-20250223133118-3dea338dc267
88
github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000
99
github.com/kcp-dev/logicalcluster/v3 v3.0.5
1010
github.com/spf13/cobra v1.8.1
1111
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
1212
github.com/stretchr/testify v1.9.0
1313
github.com/xlab/treeprint v1.2.0
14-
k8s.io/apiextensions-apiserver v0.31.0
15-
k8s.io/apimachinery v0.31.0
14+
k8s.io/apiextensions-apiserver v0.31.6
15+
k8s.io/apimachinery v0.31.6
1616
k8s.io/cli-runtime v0.31.0
17-
k8s.io/client-go v0.31.0
18-
k8s.io/component-base v0.31.0
17+
k8s.io/client-go v0.31.6
18+
k8s.io/component-base v0.31.6
1919
k8s.io/klog/v2 v2.130.1
2020
)
2121

@@ -44,7 +44,7 @@ require (
4444
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4545
github.com/josharian/intern v1.0.0 // indirect
4646
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb // indirect
47+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250223115924-431177b024f3 // indirect
4848
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4949
github.com/mailru/easyjson v0.7.7 // indirect
5050
github.com/mattn/go-runewidth v0.0.12 // indirect
@@ -73,7 +73,7 @@ require (
7373
gopkg.in/inf.v0 v0.9.1 // indirect
7474
gopkg.in/yaml.v2 v2.4.0 // indirect
7575
gopkg.in/yaml.v3 v3.0.1 // indirect
76-
k8s.io/api v0.31.0 // indirect
76+
k8s.io/api v0.31.6 // indirect
7777
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7878
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
7979
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎cli/go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
9696
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
9797
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
9898
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
99-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb h1:W11F/dp6NdUnHeB0SrpyWLiifRosu1qaMJvdFGGLXc0=
100-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb/go.mod h1:mEDD1K5BVUXJ4CP6wcJ0vZUf+7tbFMjkCFzBKsUNj18=
101-
github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e h1:9wOMy1qKXpefpW28vccGEX3o/IaoDu3PZSqDeaz1p8k=
102-
github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e/go.mod h1:GZTo7YtdO7PJ6VwWjKUiby5WjNh7YQZieDqNvbSHd0U=
99+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250223115924-431177b024f3 h1:YwNX7ZIpQXg9u5vav/fobmf4nnO0WhbELWaL3X74Oe4=
100+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250223115924-431177b024f3/go.mod h1:n0+EV+LGKl1MXXqGbGcn0AaBv7hdKsdazSYuq8nM8Us=
101+
github.com/kcp-dev/client-go v0.0.0-20250223133118-3dea338dc267 h1:Ec2/Mh7mVvboBFol0S8u30arfA7oyk/VtHL9Xojjvfs=
102+
github.com/kcp-dev/client-go v0.0.0-20250223133118-3dea338dc267/go.mod h1:1lEs8b8BYzGrMr7Q8Fs7cNVaDAWogu5lLkz5t6HtRLI=
103103
github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
104104
github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
105105
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -289,20 +289,20 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
289289
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
290290
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
291291
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
292-
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
293-
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
294-
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
295-
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
296-
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
297-
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
298-
k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY=
299-
k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk=
292+
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
293+
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
294+
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
295+
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
296+
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
297+
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
298+
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
299+
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
300300
k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA=
301301
k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw=
302-
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
303-
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
304-
k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
305-
k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
302+
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
303+
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
304+
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
305+
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
306306
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
307307
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
308308
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

‎config/crds/apis.kcp.io_apibindings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
name: apibindings.apis.kcp.io
77
spec:
88
group: apis.kcp.io

‎config/crds/apis.kcp.io_apiconversions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: apiconversions.apis.kcp.io
88
spec:
99
group: apis.kcp.io

‎config/crds/apis.kcp.io_apiexportendpointslices.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: apiexportendpointslices.apis.kcp.io
88
spec:
99
group: apis.kcp.io

‎config/crds/apis.kcp.io_apiexports.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
name: apiexports.apis.kcp.io
77
spec:
88
group: apis.kcp.io

‎config/crds/apis.kcp.io_apiresourceschemas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: apiresourceschemas.apis.kcp.io
88
spec:
99
group: apis.kcp.io

‎config/crds/core.kcp.io_logicalclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
name: logicalclusters.core.kcp.io
77
spec:
88
group: core.kcp.io

‎config/crds/core.kcp.io_shards.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: shards.core.kcp.io
88
spec:
99
group: core.kcp.io

0 commit comments

Comments
 (0)