Skip to content

Rebase to Kubernetes 1.35.1 #3842

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

Merged
kcp-ci-bot merged 13 commits into from
Mar 12, 2026
Merged

Rebase to Kubernetes 1.35.1 #3842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
275f6dd
Update Go to 1.25.7
xmudrii Feb 12, 2026
9162683
Rebase kcp-dev/apimachinery to 1.35.1
xmudrii Feb 12, 2026
66ce653
Rebase kcp-dev/code-generator to Kubernetes 1.35.1
xmudrii Feb 12, 2026
80f2096
Update code-generator codegen
xmudrii Feb 12, 2026
906088d
Update kcp-dev/client-go to Kubernetes 1.35.1
xmudrii Feb 13, 2026
317163d
Update kcp-dev/kcp to Kubernetes 1.35.1
xmudrii Mar 4, 2026
93798e7
Update third_party code in apimachinery and client-go
xmudrii Feb 23, 2026
3a54dd1
Update codegen
xmudrii Mar 4, 2026
2a161d8
Increase timeouts
xmudrii Mar 6, 2026
cbd59c6
Use different context for embedded etcd
xmudrii Mar 9, 2026
5f16dfd
Update kcp-dev/kubernetes to kcp-1.35.1
xmudrii Mar 12, 2026
a40fa80
Disable TestAPIExportAPIBindingsAccess test
xmudrii Mar 12, 2026
e19b6e1
Fix TestAuthorizer flake
xmudrii Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/docs-gen-and-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # tag=v6.3.0
with:
go-version: v1.24.13
go-version: v1.25.7
cache: true

- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 #tag=v6.2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # tag=v6.3.0
with:
go-version: v1.24.13
go-version: v1.25.7

- name: Delete non-semver tags
run: 'git tag -d $(git tag -l | grep -v "^v")'
Expand Down
18 changes: 9 additions & 9 deletions .prow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- make
- verify-boilerplate
Expand All @@ -27,7 +27,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- make
- verify-codegen
Expand All @@ -44,7 +44,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- make
- lint
Expand Down Expand Up @@ -83,7 +83,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- make
- test
Expand All @@ -104,7 +104,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- ./hack/run-with-prow.sh
- ./hack/run-with-prometheus.sh
Expand All @@ -131,7 +131,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- ./hack/run-with-prow.sh
- ./hack/run-with-prometheus.sh
Expand Down Expand Up @@ -160,7 +160,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- ./hack/run-with-prow.sh
- ./hack/run-with-prometheus.sh
Expand Down Expand Up @@ -193,7 +193,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- ./hack/run-with-prow.sh
- ./hack/run-with-prometheus.sh
Expand Down Expand Up @@ -222,7 +222,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: ghcr.io/kcp-dev/infra/build:1.24.13-1
- image: ghcr.io/kcp-dev/infra/build:1.25.7-1
command:
- ./hack/run-with-prow.sh
- ./hack/run-with-prometheus.sh
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

# Build the binary
FROM --platform=${BUILDPLATFORM} docker.io/golang:1.24.13 AS builder
FROM --platform=${BUILDPLATFORM} docker.io/golang:1.25.7 AS builder
WORKDIR /workspace

# Install dependencies.
Expand Down
9 changes: 7 additions & 2 deletions cmd/cache-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package main

import (
"context"
"flag"
"os"
"strings"
Expand Down Expand Up @@ -89,9 +90,13 @@ func main() {
}

ctx := genericapiserver.SetupSignalContext()
// the etcd server must be up before NewServer because storage decorators access it right away
// the etcd server must be up before NewServer because storage decorators access it right away.
// Use a separate context for etcd so it outlives the apiserver during graceful shutdown.
// This prevents CRD watch cache lazy initialization from blocking on a dead etcd.
etcdCtx, etcdCancel := context.WithCancel(context.Background())
defer etcdCancel()
if completedConfig.EmbeddedEtcd.Config != nil {
if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(ctx); err != nil {
if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(etcdCtx); err != nil {
return err
}
}
Expand Down
9 changes: 7 additions & 2 deletions cmd/kcp/kcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package main

import (
"context"
"fmt"
"os"
"strings"
Expand Down Expand Up @@ -143,9 +144,13 @@ func main() {
return err
}

// the etcd server must be up before NewServer because storage decorators access it right away
// the etcd server must be up before NewServer because storage decorators access it right away.
// Use a separate context for etcd so it outlives the apiserver during graceful shutdown.
// This prevents CRD watch cache lazy initialization from blocking on a dead etcd.
etcdCtx, etcdCancel := context.WithCancel(context.Background())
defer etcdCancel()
if completedConfig.EmbeddedEtcd.Config != nil {
Copy link
Copy Markdown

@mjudeikis-bot mjudeikis-bot Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Good fix — etcd now outlives the apiserver during graceful shutdown via a separate context.Background()-rooted context. This prevents CRD watch cache lazy initialization from blocking on a dead etcd connection during shutdown. The defer etcdCancel() correctly cleans up when the command handler returns.

if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(ctx); err != nil {
if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(etcdCtx); err != nil {
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/content/contributing/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Prerequisites

1. Clone the [kcp-dev/kcp](https://github.com/kcp-dev/kcp) repository.
2. [Install Go](https://golang.org/doc/install) (at least 1.24).
2. [Install Go](https://golang.org/doc/install) (at least 1.25).
3. Install [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl).

Please note that the go language version numbers in these files must exactly agree: go/go.mod file, kcp/Dockerfile, and in all the kcp/.github/workflows yaml files that specify go-version. In kcp/Dockerfile it is indicated by the "golang" attribute. In go.mod it is indicated by the "go" directive." In the .github/workflows yaml files it is indicated by "go-version".
Expand Down
36 changes: 17 additions & 19 deletions docs/generators/cli-doc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/kcp-dev/kcp/docs/generators/cli-doc

go 1.24.0
go 1.25.0

require (
github.com/kcp-dev/cli v0.0.0
github.com/kcp-dev/kcp v0.0.0
github.com/spf13/cobra v1.9.1
github.com/spf13/cobra v1.10.0
)

replace (
Expand Down Expand Up @@ -39,11 +39,10 @@ require (
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
Expand All @@ -53,7 +52,7 @@ 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.29.0-rc.1.0.20251112143648-9e5d2b714f33 // indirect
github.com/kcp-dev/apimachinery/v2 v2.29.1-0.20260223112726-38863b7c2c8e // indirect
github.com/kcp-dev/logicalcluster/v3 v3.0.5 // indirect
github.com/kcp-dev/sdk v0.0.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
Expand All @@ -71,15 +70,14 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.16.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/gomega v1.35.1 // indirect
github.com/onsi/gomega v1.38.2 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/spf13/pflag v1.0.9 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
Expand All @@ -88,20 +86,20 @@ require (
golang.org/x/term v0.38.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
google.golang.org/protobuf v1.36.8 // indirect
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/api v0.34.2 // indirect
k8s.io/apiextensions-apiserver v0.34.2 // indirect
k8s.io/apimachinery v0.34.2 // indirect
k8s.io/api v0.35.1 // indirect
k8s.io/apiextensions-apiserver v0.35.1 // indirect
k8s.io/apimachinery v0.35.1 // indirect
k8s.io/cli-runtime v0.33.3 // indirect
k8s.io/client-go v0.34.2 // indirect
k8s.io/component-base v0.34.2 // indirect
k8s.io/client-go v0.35.1 // indirect
k8s.io/component-base v0.35.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
Expand Down
Loading