Skip to content

Commit 4f40925

Browse files
committed
Automatically synchronize FGs and documentation FGs list
1 parent d9b812a commit 4f40925

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

hack/internal/tools/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ tool (
1313
gotest.tools/gotestsum
1414
helm.sh/helm/v3/cmd/helm
1515
k8s.io/code-generator
16+
k8s.io/kubernetes/test/compatibility_lifecycle/cmd
1617
sigs.k8s.io/controller-runtime/tools/setup-envtest
1718
sigs.k8s.io/controller-tools/cmd/controller-gen
1819
sigs.k8s.io/kind
@@ -35,6 +36,7 @@ require (
3536
gotest.tools/gotestsum v1.13.0
3637
helm.sh/helm/v4 v4.0.1
3738
k8s.io/code-generator v0.34.2
39+
k8s.io/kubernetes v1.34.2
3840
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250407161039-6ad5c1dd4418
3941
sigs.k8s.io/controller-tools v0.19.0
4042
sigs.k8s.io/kind v0.30.0
@@ -175,7 +177,7 @@ require (
175177
github.com/cncf/xds/go v0.0.0-20251110193048-8bfbf64dc13e // indirect
176178
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
177179
github.com/containerd/containerd v1.7.29 // indirect
178-
github.com/containerd/errdefs v0.3.0 // indirect
180+
github.com/containerd/errdefs v1.0.0 // indirect
179181
github.com/containerd/log v0.1.0 // indirect
180182
github.com/containerd/platforms v0.2.1 // indirect
181183
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect

hack/internal/tools/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL
351351
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
352352
github.com/containerd/containerd v1.7.29 h1:90fWABQsaN9mJhGkoVnuzEY+o1XDPbg9BTC9QTAHnuE=
353353
github.com/containerd/containerd v1.7.29/go.mod h1:azUkWcOvHrWvaiUjSQH0fjzuHIwSPg1WL5PshGP4Szs=
354-
github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
355-
github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
354+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
355+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
356356
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
357357
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
358358
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -1761,6 +1761,8 @@ k8s.io/kubectl v0.34.2 h1:+fWGrVlDONMUmmQLDaGkQ9i91oszjjRAa94cr37hzqA=
17611761
k8s.io/kubectl v0.34.2/go.mod h1:X2KTOdtZZNrTWmUD4oHApJ836pevSl+zvC5sI6oO2YQ=
17621762
k8s.io/kubelet v0.34.1 h1:doAaTA9/Yfzbdq/u/LveZeONp96CwX9giW6b+oHn4m4=
17631763
k8s.io/kubelet v0.34.1/go.mod h1:PtV3Ese8iOM19gSooFoQT9iyRisbmJdAPuDImuccbbA=
1764+
k8s.io/kubernetes v1.34.2 h1:WQdDvYJazkmkwSncgNwGvVtaCt4TYXIU3wSMRgvp3MI=
1765+
k8s.io/kubernetes v1.34.2/go.mod h1:m6pZk6a179pRo2wsTiCPORJ86iOEQmfIzUvtyEF8BwA=
17641766
k8s.io/metrics v0.34.2 h1:zao91FNDVPRGIiHLO2vqqe21zZVPien1goyzn0hsz90=
17651767
k8s.io/metrics v0.34.2/go.mod h1:Ydulln+8uZZctUM8yrUQX4rfq/Ay6UzsuXf24QJ37Vc=
17661768
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=

hack/internal/tools/pinversion.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
_ "gotest.tools/gotestsum"
3131
_ "helm.sh/helm/v4/cmd/helm"
3232
_ "k8s.io/code-generator"
33+
_ "k8s.io/kubernetes/test/compatibility_lifecycle"
3334
_ "sigs.k8s.io/controller-runtime/tools/setup-envtest"
3435
_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
3536
_ "sigs.k8s.io/kind"

hack/update-featuregates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -o nounset
1919
set -o pipefail
2020

2121
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
22-
MOD_FILE="${REPO_ROOT}/hack/tools/go.mod"
22+
MOD_FILE="${REPO_ROOT}/hack/internal/tools/go.mod"
2323
K8S_TOOL_PKG="k8s.io/kubernetes/test/compatibility_lifecycle"
2424
REFERENCE_DIR="${REPO_ROOT}/test/compatibility_lifecycle/reference"
2525
REFERENCE_FILE="${REFERENCE_DIR}/versioned_feature_list.yaml"

hack/verify-featuregates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -o nounset
1919
set -o pipefail
2020

2121
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
22-
MOD_FILE="${REPO_ROOT}/hack/tools/go.mod"
22+
MOD_FILE="${REPO_ROOT}/hack/internal/tools/go.mod"
2323
K8S_TOOL_PKG="k8s.io/kubernetes/test/compatibility_lifecycle"
2424
REFERENCE_FILE="${REPO_ROOT}/test/compatibility_lifecycle/reference/versioned_feature_list.yaml"
2525
SITE_DATA_FILE="${REPO_ROOT}/site/data/featuregates/versioned_feature_list.yaml"

pkg/features/kube_features.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ var defaultVersionedFeatureGates = map[featuregate.Feature]featuregate.Versioned
245245
{Version: version.MustParse("0.4"), Default: false, PreRelease: featuregate.Alpha},
246246
{Version: version.MustParse("0.5"), Default: true, PreRelease: featuregate.Beta},
247247
},
248-
249248
FlavorFungibility: {
250249
{Version: version.MustParse("0.5"), Default: true, PreRelease: featuregate.Beta},
251250
},

0 commit comments

Comments
 (0)