Skip to content

Commit 6086bf4

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #3511 from ntnn/kcp-1.33.3
Rebase to kube 1.33.3
2 parents 8f5abad + cc1ec7d commit 6086bf4

File tree

38 files changed

+715
-706
lines changed

38 files changed

+715
-706
lines changed

‎.github/workflows/docs-gen-and-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
3636
with:
37-
go-version: v1.23.10
37+
go-version: v1.24.5
3838
cache: true
3939

4040
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 #tag=v5.6.0

‎.github/workflows/goreleaser.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,18 @@ jobs:
2323

2424
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
2525
with:
26-
go-version: v1.23.10
26+
go-version: v1.24.5
27+
28+
- name: Download go modules
29+
run: |
30+
echo "Downloading modules for go.mod"
31+
go mod download
32+
for gomod in **/go.mod; do
33+
echo "Downloading modules for $gomod"
34+
cd $(dirname $gomod)
35+
go mod download
36+
cd -
37+
done
2738
2839
- name: Delete non-semver tags
2940
run: 'git tag -d $(git tag -l | grep -v "^v")'
@@ -37,7 +48,7 @@ jobs:
3748
with:
3849
distribution: goreleaser
3950
version: latest
40-
args: release --timeout 60m
51+
args: release --timeout 60m --parallelism 1 --fail-fast
4152
env:
4253
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4354
KREW_GITHUB_TOKEN: ${{ secrets.KREW_GITHUB_TOKEN }}
@@ -48,7 +59,7 @@ jobs:
4859
with:
4960
distribution: goreleaser
5061
version: latest
51-
args: release --timeout 60m --snapshot
62+
args: release --timeout 60m --snapshot --parallelism 1 --fail-fast
5263
env:
5364
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5465
KREW_GITHUB_TOKEN: ${{ secrets.KREW_GITHUB_TOKEN }}

‎.prow.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ presubmits:
77
preset-goproxy: "true"
88
spec:
99
containers:
10-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
10+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
1111
command:
1212
- make
1313
- verify-boilerplate
@@ -27,7 +27,7 @@ presubmits:
2727
preset-goproxy: "true"
2828
spec:
2929
containers:
30-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
30+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
3131
command:
3232
- make
3333
- verify-codegen
@@ -44,7 +44,7 @@ presubmits:
4444
preset-goproxy: "true"
4545
spec:
4646
containers:
47-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
47+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
4848
command:
4949
- make
5050
- lint
@@ -83,7 +83,7 @@ presubmits:
8383
preset-goproxy: "true"
8484
spec:
8585
containers:
86-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
86+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
8787
command:
8888
- make
8989
- test
@@ -104,7 +104,7 @@ presubmits:
104104
preset-goproxy: "true"
105105
spec:
106106
containers:
107-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
107+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
108108
command:
109109
- ./hack/run-with-prow.sh
110110
- ./hack/run-with-prometheus.sh
@@ -131,7 +131,7 @@ presubmits:
131131
preset-goproxy: "true"
132132
spec:
133133
containers:
134-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
134+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
135135
command:
136136
- ./hack/run-with-prow.sh
137137
- ./hack/run-with-prometheus.sh
@@ -160,7 +160,7 @@ presubmits:
160160
preset-goproxy: "true"
161161
spec:
162162
containers:
163-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
163+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
164164
command:
165165
- ./hack/run-with-prow.sh
166166
- ./hack/run-with-prometheus.sh
@@ -191,7 +191,7 @@ presubmits:
191191
preset-goproxy: "true"
192192
spec:
193193
containers:
194-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
194+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
195195
command:
196196
- ./hack/run-with-prow.sh
197197
- ./hack/run-with-prometheus.sh
@@ -220,7 +220,7 @@ presubmits:
220220
preset-goproxy: "true"
221221
spec:
222222
containers:
223-
- image: ghcr.io/kcp-dev/infra/build:1.23.10-1
223+
- image: ghcr.io/kcp-dev/infra/build:1.24.5-1
224224
command:
225225
- ./hack/run-with-prow.sh
226226
- ./hack/run-with-prometheus.sh

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
# Build the binary
18-
FROM --platform=${BUILDPLATFORM} docker.io/golang:1.23.10 AS builder
18+
FROM --platform=${BUILDPLATFORM} docker.io/golang:1.24.5 AS builder
1919
WORKDIR /workspace
2020

2121
# Install dependencies.

‎cli/go.mod‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module github.com/kcp-dev/kcp/cli
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/kcp-dev/client-go v0.0.0-20250707095244-decc4df45adb
7+
github.com/kcp-dev/client-go v0.0.0-20250728134101-0355faa9361b
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.9.1
1111
github.com/spf13/pflag v1.0.6
1212
github.com/stretchr/testify v1.10.0
1313
github.com/xlab/treeprint v1.2.0
14-
k8s.io/apiextensions-apiserver v0.32.3
15-
k8s.io/apimachinery v0.32.3
16-
k8s.io/cli-runtime v0.32.3
17-
k8s.io/client-go v0.32.3
18-
k8s.io/component-base v0.32.3
14+
k8s.io/apiextensions-apiserver v0.33.3
15+
k8s.io/apimachinery v0.33.3
16+
k8s.io/cli-runtime v0.33.3
17+
k8s.io/client-go v0.33.3
18+
k8s.io/component-base v0.33.3
1919
k8s.io/klog/v2 v2.130.1
2020
)
2121

@@ -32,17 +32,15 @@ require (
3232
github.com/go-openapi/jsonreference v0.21.0 // indirect
3333
github.com/go-openapi/swag v0.23.0 // indirect
3434
github.com/gogo/protobuf v1.3.2 // indirect
35-
github.com/golang/protobuf v1.5.4 // indirect
3635
github.com/google/btree v1.1.3 // indirect
3736
github.com/google/gnostic-models v0.6.9 // indirect
38-
github.com/google/gofuzz v1.2.0 // indirect
3937
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4038
github.com/google/uuid v1.6.0 // indirect
4139
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
4240
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4341
github.com/josharian/intern v1.0.0 // indirect
4442
github.com/json-iterator/go v1.1.12 // indirect
45-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077 // indirect
43+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250728122101-adbf20db3e51 // indirect
4644
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4745
github.com/mailru/easyjson v0.9.0 // indirect
4846
github.com/mattn/go-runewidth v0.0.12 // indirect
@@ -52,31 +50,31 @@ require (
5250
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5351
github.com/muesli/reflow v0.3.0 // indirect
5452
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
55-
github.com/onsi/gomega v1.36.2 // indirect
53+
github.com/onsi/gomega v1.35.1 // indirect
5654
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5755
github.com/pkg/errors v0.9.1 // indirect
5856
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5957
github.com/rivo/uniseg v0.2.0 // indirect
60-
github.com/rogpeppe/go-internal v1.13.1 // indirect
6158
github.com/x448/float16 v0.8.4 // indirect
62-
golang.org/x/net v0.39.0 // indirect
59+
golang.org/x/net v0.40.0 // indirect
6360
golang.org/x/oauth2 v0.29.0 // indirect
64-
golang.org/x/sync v0.13.0 // indirect
65-
golang.org/x/sys v0.32.0 // indirect
66-
golang.org/x/term v0.31.0 // indirect
67-
golang.org/x/text v0.24.0 // indirect
61+
golang.org/x/sync v0.14.0 // indirect
62+
golang.org/x/sys v0.33.0 // indirect
63+
golang.org/x/term v0.32.0 // indirect
64+
golang.org/x/text v0.25.0 // indirect
6865
golang.org/x/time v0.11.0 // indirect
69-
google.golang.org/protobuf v1.36.2 // indirect
66+
google.golang.org/protobuf v1.36.5 // indirect
7067
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7168
gopkg.in/inf.v0 v0.9.1 // indirect
7269
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
k8s.io/api v0.32.3 // indirect
74-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
75-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
70+
k8s.io/api v0.33.3 // indirect
71+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
72+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
7673
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
77-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
78-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
79-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
74+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
75+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
76+
sigs.k8s.io/randfill v1.0.0 // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
8078
sigs.k8s.io/yaml v1.4.0 // indirect
8179
)
8280

0 commit comments

Comments
 (0)