Skip to content

chore: bump sigs.k8s.io/kind from 0.30.0 to 0.31.0 #1966

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

Draft
Camila-B wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: bump sigs.k8s.io/kind from 0.30.0 to 0.31.0 #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bb3b04
chore: bump sigs.k8s.io/kind from 0.30.0 to 0.31.0
dependabot[bot] Dec 18, 2025
6b435cd
fix kind cluster creation
Camila-B Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions e2e/nomostest/clusters/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"os/exec"
"path/filepath"
"sync"
"time"

"github.com/GoogleContainerTools/config-sync/e2e"
"github.com/GoogleContainerTools/config-sync/e2e/nomostest/docker"
Expand All @@ -40,7 +39,7 @@ const (

// maxKindTries is the number of times to attempt to create a Kind cluster for
// a single test.
maxKindTries = 6
maxKindTries = 2
Copy link

@gemini-code-assist gemini-code-assist bot Dec 18, 2025

Choose a reason for hiding this comment

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

medium

Reducing maxKindTries from 6 to 2 could potentially increase test flakiness if KinD cluster creation is not perfectly reliable. If cluster creation failures are still possible, it might be safer to keep a higher number of retries to ensure test stability. Consider reverting this change or monitoring test results closely for any increase in flakes related to cluster creation.

Suggested change
maxKindTries = 2
maxKindTries = 6

)

// KindCluster is a kind cluster for use in the e2e tests
Expand Down Expand Up @@ -83,7 +82,7 @@ func (c *KindCluster) Create() error {
c.initProvider()
tg := taskgroup.New()
tg.Go(func() error {
return createKindCluster(c.provider, c.Name, c.KubeConfigPath)
return createKindCluster(c.provider, c.Name, c.KubeConfigPath, c)
})
tg.Go(func() error {
return pullImages()
Expand Down Expand Up @@ -132,7 +131,7 @@ func (c *KindCluster) Hash() (string, error) {
return "N/A for KinD cluster", nil
}

func createKindCluster(p *cluster.Provider, name, kcfgPath string) error {
func createKindCluster(p *cluster.Provider, name, kcfgPath string, c *KindCluster) error {
var err error
for i := 0; i < maxKindTries; i++ {
if i > 0 {
Expand Down Expand Up @@ -171,6 +170,7 @@ func createKindCluster(p *cluster.Provider, name, kcfgPath string) error {
KubeadmConfigPatches: []string{
`
kind: ClusterConfiguration
apiVersion: kubeadm.k8s.io/v1beta3
etcd:
local:
dataDir: /tmp/etcd
Expand All @@ -182,11 +182,12 @@ apiServer:
// Retain nodes for debugging logs.
cluster.CreateWithRetain(true),
// Wait for cluster to be ready before proceeding
cluster.CreateWithWaitForReady(10*time.Minute),
// cluster.CreateWithWaitForReady(10*time.Minute),
)
if err == nil {
return nil
}
c.T.Logf("Error occurred: %v", err)
}

// We failed to create the cluster maxKindTries times, so fail out.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require (
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231023142458-b9f29826ee83
sigs.k8s.io/controller-tools v0.18.0
sigs.k8s.io/kind v0.30.0
sigs.k8s.io/kind v0.31.0
sigs.k8s.io/kustomize/api v0.21.0
sigs.k8s.io/kustomize/kyaml v0.21.0
sigs.k8s.io/structured-merge-diff/v6 v6.3.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9x
sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/kind v0.30.0 h1:2Xi1KFEfSMm0XDcvKnUt15ZfgRPCT0OnCBbpgh8DztY=
sigs.k8s.io/kind v0.30.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
sigs.k8s.io/kind v0.31.0 h1:UcT4nzm+YM7YEbqiAKECk+b6dsvc/HRZZu9U0FolL1g=
sigs.k8s.io/kind v0.31.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
sigs.k8s.io/kustomize/api v0.21.0 h1:I7nry5p8iDJbuRdYS7ez8MUvw7XVNPcIP5GkzzuXIIQ=
sigs.k8s.io/kustomize/api v0.21.0/go.mod h1:XGVQuR5n2pXKWbzXHweZU683pALGw/AMVO4zU4iS8SE=
sigs.k8s.io/kustomize/kyaml v0.21.0 h1:7mQAf3dUwf0wBerWJd8rXhVcnkk5Tvn/q91cGkaP6HQ=
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@ sigs.k8s.io/controller-tools/pkg/webhook
## explicit; go 1.23
sigs.k8s.io/json
sigs.k8s.io/json/internal/golang/encoding/json
# sigs.k8s.io/kind v0.30.0
# sigs.k8s.io/kind v0.31.0
## explicit; go 1.17
sigs.k8s.io/kind
sigs.k8s.io/kind/cmd/kind/app
Expand Down
3 changes: 0 additions & 3 deletions vendor/sigs.k8s.io/kind/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/.go-version
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions vendor/sigs.k8s.io/kind/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/build/nodeimage/const_cni.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/sigs.k8s.io/kind/pkg/build/nodeimage/const_storage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/build/nodeimage/defaults.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/cluster/internal/loadbalancer/const.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/docker/network.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/docker/node.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.