karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5901 from RainbowMango/pr_bump_kind 

Bump kind dependencis from v0.24.0 to v0.25.0
This commit is contained in:
karmada-bot 2024-12-03 09:43:08 +08:00 committed by GitHub
parent 3323935575 addc75ee6c
commit 7a9e4a18fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -56,7 +56,7 @@ require (
sigs.k8s.io/cluster-api v1.7.1 sigs.k8s.io/cluster-api v1.7.1
sigs.k8s.io/controller-runtime v0.19.1 sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/custom-metrics-apiserver v1.30.1-0.20241105195130-84dc8cfe2555 sigs.k8s.io/custom-metrics-apiserver v1.30.1-0.20241105195130-84dc8cfe2555
sigs.k8s.io/kind v0.24.0 sigs.k8s.io/kind v0.25.0
sigs.k8s.io/mcs-api v0.1.0 sigs.k8s.io/mcs-api v0.1.0
sigs.k8s.io/metrics-server v0.7.1 sigs.k8s.io/metrics-server v0.7.1
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 sigs.k8s.io/structured-merge-diff/v4 v4.4.1

4
go.sum
View File

@ -1488,8 +1488,8 @@ sigs.k8s.io/custom-metrics-apiserver v1.30.1-0.20241105195130-84dc8cfe2555/go.mo
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4= sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4=
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg= sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
sigs.k8s.io/kind v0.24.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw= sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g=
sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0=
sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ=

2
hack/cli-testing-environment.sh
View File

@ -35,7 +35,7 @@ BUILD_PATH=${BUILD_PATH:-"_output/bin/linux/amd64"}
# install kind and kubectl # install kind and kubectl
kind_version=v0.22.0 kind_version=v0.25.0
echo -n "Preparing: 'kind' existence check - " echo -n "Preparing: 'kind' existence check - "
if util::cmd_exist kind; then if util::cmd_exist kind; then
echo "passed" echo "passed"

2
hack/cli-testing-init-with-config.sh
View File

@ -35,7 +35,7 @@ BUILD_PATH=${BUILD_PATH:-"_output/bin/linux/amd64"}
CONFIG_FILE_PATH=${CONFIG_FILE_PATH:-"/tmp/karmada-config.yaml"} CONFIG_FILE_PATH=${CONFIG_FILE_PATH:-"/tmp/karmada-config.yaml"}
# install kind and kubectl # install kind and kubectl
kind_version=v0.24.0 kind_version=v0.25.0
echo -n "Preparing: 'kind' existence check - " echo -n "Preparing: 'kind' existence check - "
if util::cmd_exist kind; then if util::cmd_exist kind; then
echo "passed" echo "passed"

2
hack/local-up-karmada-by-operator.sh
View File

@ -87,7 +87,7 @@ util::verify_go_version
util::cmd_must_exist "docker" util::cmd_must_exist "docker"
# install kind and kubectl # install kind and kubectl
kind_version=v0.24.0 kind_version=v0.25.0
echo -n "Preparing: 'kind' existence check - " echo -n "Preparing: 'kind' existence check - "
if util::cmd_exist kind; then if util::cmd_exist kind; then
echo "passed" echo "passed"

2
hack/local-up-karmada.sh
View File

@ -80,7 +80,7 @@ util::verify_go_version
util::verify_docker util::verify_docker
# install kind and kubectl # install kind and kubectl
kind_version=v0.24.0 kind_version=v0.25.0
echo -n "Preparing: 'kind' existence check - " echo -n "Preparing: 'kind' existence check - "
if util::cmd_exist kind; then if util::cmd_exist kind; then
echo "passed" echo "passed"

2
hack/util.sh
View File

@ -39,7 +39,7 @@ KARMADA_GO_PACKAGE="github.com/karmada-io/karmada"
MIN_Go_VERSION=go1.22.9 MIN_Go_VERSION=go1.22.9
DEFAULT_CLUSTER_VERSION="kindest/node:v1.31.0" DEFAULT_CLUSTER_VERSION="kindest/node:v1.31.2"
KARMADA_TARGET_SOURCE=( KARMADA_TARGET_SOURCE=(
karmada-aggregated-apiserver=cmd/aggregated-apiserver karmada-aggregated-apiserver=cmd/aggregated-apiserver

2
vendor/modules.txt vendored
View File

@ -1868,7 +1868,7 @@ sigs.k8s.io/custom-metrics-apiserver/pkg/registry/external_metrics
## explicit; go 1.18 ## explicit; go 1.18
sigs.k8s.io/json sigs.k8s.io/json
sigs.k8s.io/json/internal/golang/encoding/json sigs.k8s.io/json/internal/golang/encoding/json
# sigs.k8s.io/kind v0.24.0 # sigs.k8s.io/kind v0.25.0
## explicit; go 1.17 ## explicit; go 1.17
sigs.k8s.io/kind/pkg/apis/config/defaults sigs.k8s.io/kind/pkg/apis/config/defaults
sigs.k8s.io/kind/pkg/apis/config/v1alpha4 sigs.k8s.io/kind/pkg/apis/config/v1alpha4

2
vendor/sigs.k8s.io/kind/pkg/apis/config/defaults/image.go generated vendored
View File

@ -18,4 +18,4 @@ limitations under the License.
package defaults package defaults
// Image is the default for the Config.Image field, aka the default node image. // Image is the default for the Config.Image field, aka the default node image.
const Image = "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" const Image = "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e"

12
vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/docker/network.go generated vendored
View File

@ -261,7 +261,17 @@ func checkIfNetworkExists(name string) (bool, error) {
func isIPv6UnavailableError(err error) bool { func isIPv6UnavailableError(err error) bool {
rerr := exec.RunErrorForError(err) rerr := exec.RunErrorForError(err)
return rerr != nil && strings.HasPrefix(string(rerr.Output), "Error response from daemon: Cannot read IPv6 setup for bridge") if rerr == nil {
return false
}
errorMessage := string(rerr.Output)
// we get this error when ipv6 was disabled in docker
const dockerIPV6DisabledError = "Error response from daemon: Cannot read IPv6 setup for bridge"
// TODO: this is fragile, and only necessary due to docker enabling ipv6 by default
// even on hosts that lack ip6tables setup.
// Preferably users would either have ip6tables setup properly or else disable ipv6 in docker
const dockerIPV6TablesError = "Error response from daemon: Failed to Setup IP tables: Unable to enable NAT rule: (iptables failed: ip6tables"
return strings.HasPrefix(errorMessage, dockerIPV6DisabledError) || strings.HasPrefix(errorMessage, dockerIPV6TablesError)
} }
func isPoolOverlapError(err error) bool { func isPoolOverlapError(err error) bool {

13
vendor/sigs.k8s.io/kind/pkg/cluster/internal/providers/podman/provider.go generated vendored
View File

@ -171,6 +171,15 @@ func (p *provider) DeleteNodes(n []nodes.Node) error {
return deleteVolumes(nodeVolumes) return deleteVolumes(nodeVolumes)
} }
// getHostIPOrDefault defaults HostIP to localhost if is not set
// xref: https://github.com/kubernetes-sigs/kind/issues/3777
func getHostIPOrDefault(hostIP string) string {
if hostIP == "" {
return "127.0.0.1"
}
return hostIP
}
// GetAPIServerEndpoint is part of the providers.Provider interface // GetAPIServerEndpoint is part of the providers.Provider interface
func (p *provider) GetAPIServerEndpoint(cluster string) (string, error) { func (p *provider) GetAPIServerEndpoint(cluster string) (string, error) {
// locate the node that hosts this // locate the node that hosts this
@ -266,7 +275,7 @@ func (p *provider) GetAPIServerEndpoint(cluster string) (string, error) {
} }
for _, pm := range v { for _, pm := range v {
if containerPort == common.APIServerInternalPort && protocol == "tcp" { if containerPort == common.APIServerInternalPort && protocol == "tcp" {
return net.JoinHostPort(pm.HostIP, pm.HostPort), nil return net.JoinHostPort(getHostIPOrDefault(pm.HostIP), pm.HostPort), nil
} }
} }
} }
@ -278,7 +287,7 @@ func (p *provider) GetAPIServerEndpoint(cluster string) (string, error) {
} }
for _, pm := range portMappings19 { for _, pm := range portMappings19 {
if pm.ContainerPort == common.APIServerInternalPort && pm.Protocol == "tcp" { if pm.ContainerPort == common.APIServerInternalPort && pm.Protocol == "tcp" {
return net.JoinHostPort(pm.HostIP, strconv.Itoa(int(pm.HostPort))), nil return net.JoinHostPort(getHostIPOrDefault(pm.HostIP), strconv.Itoa(int(pm.HostPort))), nil
} }
} }

2
vendor/sigs.k8s.io/kind/pkg/cmd/kind/version/version.go generated vendored
View File

@ -54,7 +54,7 @@ func DisplayVersion() string {
} }
// versionCore is the core portion of the kind CLI version per Semantic Versioning 2.0.0 // versionCore is the core portion of the kind CLI version per Semantic Versioning 2.0.0
const versionCore = "0.24.0" const versionCore = "0.25.0"
// versionPreRelease is the base pre-release portion of the kind CLI version per // versionPreRelease is the base pre-release portion of the kind CLI version per
// Semantic Versioning 2.0.0 // Semantic Versioning 2.0.0