diff --git a/go.mod b/go.mod index 59f507e4aec..79be5a016a6 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,6 @@ replace ( k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241113140430-071651de9452 k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241113140430-071651de9452 k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20241113140430-071651de9452 - k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241113140430-071651de9452 k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241113140430-071651de9452 k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241113140430-071651de9452 k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241113140430-071651de9452 diff --git a/hack/bump-k8s.sh b/hack/bump-k8s.sh index da405eaf3d4..5705dcd0a6c 100755 --- a/hack/bump-k8s.sh +++ b/hack/bump-k8s.sh @@ -29,7 +29,7 @@ set -o xtrace # Note: setting GOPROXY=direct allows us to bump very quickly after the fork has been committed to. GITHUB_USER=${GITHUB_USER:-kcp-dev} GITHUB_REPO=${GITHUB_REPO:-kubernetes} -BRANCH=${BRANCH:-kcp-feature-logical-clusters-1.24-v3} +BRANCH=${BRANCH:-kcp-1.31.0} current_version="$( GOPROXY=direct go mod edit -json | jq '.Replace[] | select(.Old.Path=="k8s.io/kubernetes") | .New.Version' --raw-output )"