Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.0
require (
github.com/golangci/golangci-lint/v2 v2.7.2
github.com/psampaz/go-mod-outdated v0.9.0
sigs.k8s.io/kind v0.30.0
sigs.k8s.io/kind v0.31.0
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Search shipyard codebase for kubeadmConfigPatches and kind cluster configurations
echo "=== Searching for kubeadmConfigPatches ==="
find . -type f \( -name "*.go" -o -name "*.yaml" -o -name "*.yml" -o -name "*.sh" \) | head -20 | xargs grep -l "kubeadmConfigPatches" 2>/dev/null || echo "No files with kubeadmConfigPatches found"

echo -e "\n=== Searching for kind cluster config files ==="
find . -type f \( -name "*kind*config*" -o -name "*cluster*.yaml" -o -name "*cluster*.yml" \) | head -20

echo -e "\n=== Searching for extraArgs in configuration files ==="
grep -r "extraArgs" --include="*.yaml" --include="*.yml" --include="*.go" . 2>/dev/null | head -20 || echo "No extraArgs found"

echo -e "\n=== Checking for cgroup-specific configurations ==="
grep -ri "cgroup" . --include="*.go" --include="*.sh" --include="*.yaml" 2>/dev/null | head -20 || echo "No cgroup configurations found"

Repository: submariner-io/shipyard

Length of output: 653


🏁 Script executed:

#!/bin/bash
# List the directory structure to understand the repo layout
echo "=== Repository structure ==="
ls -la

echo -e "\n=== Searching for kind-related configurations ==="
find . -type f \( -name "*.yaml" -o -name "*.yml" \) | xargs grep -l "kind.*Cluster\|kubeadmConfigPatches" 2>/dev/null || echo "No kind cluster configs found"

echo -e "\n=== Searching Go code for kind usage ==="
find . -name "*.go" -type f | xargs grep -l "kubeadmConfigPatches\|extraArgs" 2>/dev/null | head -10 || echo "No Go files with relevant code found"

Repository: submariner-io/shipyard

Length of output: 3567


🏁 Script executed:

#!/bin/bash
echo "=== kind-cluster-config.yaml ==="
cat ./scripts/shared/resources/kind-cluster-config.yaml

echo -e "\n=== kind-cluster-dual-stack-config.yaml ==="
cat ./scripts/shared/resources/kind-cluster-dual-stack-config.yaml | head -30

Repository: submariner-io/shipyard

Length of output: 1412


Update kubeadmConfigPatches from v1beta2 to v1beta3 and prepare v1beta4 variants for kind v0.31.0.

Kind v0.31.0 uses kubeadm v1beta3 for Kubernetes 1.23+ (including the default v1.35.0), but the kind cluster config files specify the obsolete v1beta2 API version. Kind no longer tests or actively supports v1beta2. Update kind-cluster-config.yaml and kind-cluster-dual-stack-config.yaml to use apiVersion: kubeadm.k8s.io/v1beta3.

Additionally, kind will likely use v1beta4 for Kubernetes 1.36+. Provide versioned config patches for both v1beta3 and v1beta4 to ensure future compatibility.

Also verify cgroup v2 environment support: Kind v0.31.0 defaults to Kubernetes v1.35.0, which removes cgroup v1 support.

🤖 Prompt for AI Agents
In tools/go.mod around line 8, update the kind-related cluster config files to
replace kubeadmConfigPatches apiVersion v1beta2 with kubeadm.k8s.io/v1beta3 and
add parallel kubeadm.k8s.io/v1beta4 variants for future Kubernetes 1.36+
compatibility: modify kind-cluster-config.yaml and
kind-cluster-dual-stack-config.yaml to use apiVersion: kubeadm.k8s.io/v1beta3,
create corresponding v1beta4 patch files or variants (same content but
apiVersion: kubeadm.k8s.io/v1beta4), and ensure any code/CI that references the
old v1beta2 filenames or keys is updated; lastly, add a note or check in the
setup/docs/CI to verify cgroup v2 support (or detect cgroup v2 and fail fast)
because kind v0.31.0 defaults to Kubernetes v1.35 which drops cgroup v1 support.

)

require (
Expand Down
4 changes: 2 additions & 2 deletions tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=
mvdan.cc/gofumpt v0.9.2/go.mod h1:iB7Hn+ai8lPvofHd9ZFGVg2GOr8sBUw1QUWjNbmIL/s=
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 h1:ssMzja7PDPJV8FStj7hq9IKiuiKhgz9ErWw+m68e7DI=
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15/go.mod h1:4M5MMXl2kW6fivUT6yRGpLLPNfuGtU2Z0cPvFquGDYU=
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/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
Loading