From 13ffbf9c1f6a0fb97c95504b3b44cab8dea9654e Mon Sep 17 00:00:00 2001 From: Gong Zhang Date: Thu, 12 Dec 2024 11:27:03 +0800 Subject: [PATCH] Bump the K8s group to v0.32.0 and capi for e2e to v1.9.0 --- go.mod | 20 ++++++++--------- go.sum | 40 ++++++++++++++++----------------- test/e2e/config/vsphere-ci.yaml | 6 ++--- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 558f66ac5..6776f8d24 100644 --- a/go.mod +++ b/go.mod @@ -25,12 +25,12 @@ require ( golang.org/x/net v0.32.0 gopkg.in/gcfg.v1 v1.2.3 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.32.0-rc.0 - k8s.io/apimachinery v0.32.0-rc.0 - k8s.io/client-go v0.32.0-rc.0 - k8s.io/cloud-provider v0.32.0-rc.0 - k8s.io/code-generator v0.32.0-rc.0 - k8s.io/component-base v0.32.0-rc.0 + k8s.io/api v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/client-go v0.32.0 + k8s.io/cloud-provider v0.32.0 + k8s.io/code-generator v0.32.0 + k8s.io/component-base v0.32.0 k8s.io/klog/v2 v2.130.1 sigs.k8s.io/yaml v1.4.0 ) @@ -121,11 +121,11 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.31.0-alpha.3 // indirect - k8s.io/apiserver v0.32.0-rc.0 // indirect - k8s.io/component-helpers v0.32.0-rc.0 // indirect - k8s.io/controller-manager v0.32.0-rc.0 // indirect + k8s.io/apiserver v0.32.0 // indirect + k8s.io/component-helpers v0.32.0 // indirect + k8s.io/controller-manager v0.32.0 // indirect k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect - k8s.io/kms v0.32.0-rc.0 // indirect + k8s.io/kms v0.32.0 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect diff --git a/go.sum b/go.sum index a3ce2b375..885651df5 100644 --- a/go.sum +++ b/go.sum @@ -315,32 +315,32 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.0-rc.0 h1:/JeK0EoDPuDmV4YhcojORdB38o3tfSJlEXx6zBIFVBE= -k8s.io/api v0.32.0-rc.0/go.mod h1:cWKDBZRmf22qbGbFb7nTF1Bgyft9Y8/2Ems4nfonwsU= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= k8s.io/apiextensions-apiserver v0.31.0-alpha.3 h1:VuaSODxQf/g/4DOUolhd8Qv78Cejs9XRG+rZUwBxvzY= k8s.io/apiextensions-apiserver v0.31.0-alpha.3/go.mod h1:mpm07GF4AzUOKvRYAXWcOlaJ4qF9aQW1q4OqOFNoQ4w= -k8s.io/apimachinery v0.32.0-rc.0 h1:u+1irgylqNowg1vQFJJqw0UASsb07LhSpFvIX+EnI5A= -k8s.io/apimachinery v0.32.0-rc.0/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY= -k8s.io/apiserver v0.32.0-rc.0 h1:Djr9zFBIgWctxuO9pOYPFG3VSraachj9QU2V6uUdgBw= -k8s.io/apiserver v0.32.0-rc.0/go.mod h1:S1L6AHxdnAMUR1oq0srAq15veddvijAYP1hcMiPkM6I= -k8s.io/client-go v0.32.0-rc.0 h1:8QFsKiUSQsERKRnfEyfw2TV37f/mdR8BEEzFqJqg6y0= -k8s.io/client-go v0.32.0-rc.0/go.mod h1:ke1QuLYLBZ/4oUqsb2emcPoDcdSGE1jYL9IQnD8wByU= -k8s.io/cloud-provider v0.32.0-rc.0 h1:D4twG9FAtF+CN31crrpkQQ8wN+P20zeDGAI0FzkSWF4= -k8s.io/cloud-provider v0.32.0-rc.0/go.mod h1:X+EynNPPFvESy1nS2tJULeYWYA6kqy6SvPw+GHMSvXE= -k8s.io/code-generator v0.32.0-rc.0 h1:spb8jpefFz3v6E4Riff2g2DHk9X9sfokHUvybQoNFGQ= -k8s.io/code-generator v0.32.0-rc.0/go.mod h1:G0ov+fb1V3ala/Iir3v73rlp5bRShm2vbd+gBbt9RtY= -k8s.io/component-base v0.32.0-rc.0 h1:x/z6A18GeEsTQjfIuoeauFoWL7IDKCJNxE6yQuqQ12g= -k8s.io/component-base v0.32.0-rc.0/go.mod h1:L8fl5Xqwi2XF3gkj8+Z92h2Hg8O9gGiV2rCCYYSDj6Q= -k8s.io/component-helpers v0.32.0-rc.0 h1:EsWFcH0qnIkVONTN9ZyWx6rq62mlY7QCgCmJSVnG2qk= -k8s.io/component-helpers v0.32.0-rc.0/go.mod h1:RXjXoNq/DQ6W4NkGMaGoF5cNbgz2lnpEIzU5AxJvvZo= -k8s.io/controller-manager v0.32.0-rc.0 h1:GQ5hD86NvbwrssRtHBzUTlqOo4f4TM+ca6boJeCmcG8= -k8s.io/controller-manager v0.32.0-rc.0/go.mod h1:Tts1ivXbUrYfvreE0Oz4XU00eOXWhKgv87e8U9jcTfg= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs= +k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/cloud-provider v0.32.0 h1:QXYJGmwME2q2rprymbmw2GroMChQYc/MWN6l/I4Kgp8= +k8s.io/cloud-provider v0.32.0/go.mod h1:cz3gVodkhgwi2ugj/JUPglIruLSdDaThxawuDyCHfr8= +k8s.io/code-generator v0.32.0 h1:s0lNN8VSWny8LBz5t5iy7MCdgwdOhdg7vAGVxvS+VWU= +k8s.io/code-generator v0.32.0/go.mod h1:b7Q7KMZkvsYFy72A79QYjiv4aTz3GvW0f1T3UfhFq4s= +k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU= +k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM= +k8s.io/component-helpers v0.32.0 h1:pQEEBmRt3pDJJX98cQvZshDgJFeKRM4YtYkMmfOlczw= +k8s.io/component-helpers v0.32.0/go.mod h1:9RuClQatbClcokXOcDWSzFKQm1huIf0FzQlPRpizlMc= +k8s.io/controller-manager v0.32.0 h1:tpQl1rvH4huFB6Avl1nhowZHtZoCNWqn6OYdZPl7Ybc= +k8s.io/controller-manager v0.32.0/go.mod h1:JRuYnYCkKj3NgBTy+KNQKIUm/lJRoDAvGbfdEmk9LhY= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.0-rc.0 h1:h0TCQDCD6K9GUrWqxovj15G+uLcOgYL1BugemI136NA= -k8s.io/kms v0.32.0-rc.0/go.mod h1:V5Pwz3QG7IjhcRfxX5nnE1OTcDzGS6K6okZ/my36WOY= +k8s.io/kms v0.32.0 h1:jwOfunHIrcdYl5FRcA+uUKKtg6qiqoPCwmS2T3XTYL4= +k8s.io/kms v0.32.0/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml index b32c35126..33bd28cbe 100644 --- a/test/e2e/config/vsphere-ci.yaml +++ b/test/e2e/config/vsphere-ci.yaml @@ -12,7 +12,7 @@ providers: versions: - name: v1.9.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.1/core-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/core-components.yaml" type: "url" contract: v1beta1 files: @@ -26,7 +26,7 @@ providers: versions: - name: v1.9.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.1/bootstrap-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -40,7 +40,7 @@ providers: versions: - name: v1.9.0 # Use manifest from source files - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.1/control-plane-components.yaml" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/control-plane-components.yaml" type: "url" contract: v1beta1 files: