diff --git a/Makefile b/Makefile index 234c6d2b60..60da07044d 100644 --- a/Makefile +++ b/Makefile @@ -190,7 +190,7 @@ IMPORT_BOSS_VER := v0.28.1 IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN)) IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss -CAPI_HACK_TOOLS_VER := e7a751ff1efec495ce85f0fa90e83851a9da996a # Note: this the commit ID of CAPI v1.10.0-rc.0 +CAPI_HACK_TOOLS_VER := 5f91df6e370cfbd634529e14f1bdbd5367303de3 # Note: this the commit ID of CAPI v1.10.0-rc.1 BOSKOSCTL_BIN := boskosctl BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN)) diff --git a/go.mod b/go.mod index c68c1ad98f..2ce932f2c1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere go 1.23.0 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1 replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505 diff --git a/go.sum b/go.sum index 50b7c94d05..d52f71f191 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4= -sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= +sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI= +sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= diff --git a/packaging/go.mod b/packaging/go.mod index f1ba481ed5..2031b2381c 100644 --- a/packaging/go.mod +++ b/packaging/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere/packaging go 1.23.0 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1 replace sigs.k8s.io/cluster-api-provider-vsphere => ../ diff --git a/packaging/go.sum b/packaging/go.sum index 5d8d3caf0e..75b9a3f315 100644 --- a/packaging/go.sum +++ b/packaging/go.sum @@ -233,8 +233,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4= -sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= +sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI= +sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index 309ed4b542..d64ac53068 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -27,7 +27,7 @@ providers: type: CoreProvider versions: - name: "v1.10.99" - value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/core-components.yaml" + value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/core-components.yaml" type: "url" contract: v1beta1 files: @@ -76,7 +76,7 @@ providers: type: BootstrapProvider versions: - name: "v1.10.99" - value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/bootstrap-components.yaml" + value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -125,7 +125,7 @@ providers: type: ControlPlaneProvider versions: - name: "v1.10.99" - value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.0/control-plane-components.yaml" + value: "https://storage.googleapis.com/k8s-staging-cluster-api/components/v1.10.0-rc.1/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -303,14 +303,14 @@ providers: variables: # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml - KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-beta.0" + KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-rc.0" # Note: currently not ci/latest-1.33 because of rate-limiting issues. - KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-beta.0" - KUBERNETES_VERSION: "v1.33.0-beta.0" + KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-rc.0" + KUBERNETES_VERSION: "v1.33.0-rc.0" KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0" - KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-beta.0" + KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-rc.0" KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33" - CPI_IMAGE_K8S_VERSION: "v1.33.0-beta.0" + CPI_IMAGE_K8S_VERSION: "v1.33.0-rc.0" CNI: "./data/cni/calico/calico.yaml" AUTOSCALER_WORKLOAD: "./data/autoscaler/autoscaler-to-management-workload.yaml" CONTROL_PLANE_MACHINE_COUNT: 1 diff --git a/test/go.mod b/test/go.mod index 1e82d0405d..2cda0c77e7 100644 --- a/test/go.mod +++ b/test/go.mod @@ -2,9 +2,9 @@ module sigs.k8s.io/cluster-api-provider-vsphere/test go 1.23.0 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.0 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.0-rc.1 -replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.0-rc.0 +replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.10.0-rc.1 replace sigs.k8s.io/cluster-api-provider-vsphere => ../ diff --git a/test/go.sum b/test/go.sum index d7d1ea84e0..3420a6c2c5 100644 --- a/test/go.sum +++ b/test/go.sum @@ -515,10 +515,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.10.0-rc.0 h1:D+89GG2aqx9Jdor+8p5d5AdosA4iMcBbtZaETdHLmH4= -sigs.k8s.io/cluster-api v1.10.0-rc.0/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= -sigs.k8s.io/cluster-api/test v1.10.0-rc.0 h1:OgpsT8KZMom0zsypVQ6nPQhlHXnhyMwUE5Bl7kgAkow= -sigs.k8s.io/cluster-api/test v1.10.0-rc.0/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4= +sigs.k8s.io/cluster-api v1.10.0-rc.1 h1:ht1WX/gmFvl17zq8o3qnRM6qqMsZAUHN6m6CFZvh6rI= +sigs.k8s.io/cluster-api v1.10.0-rc.1/go.mod h1:aiPMrNPoaJc/GuJ4TCpWX8bVe11+iCJ4HI0f3c9QiJg= +sigs.k8s.io/cluster-api/test v1.10.0-rc.1 h1:JtW17xLh8PKrxw6tGQPl5pBxBF6taV83eKcw/vwht/Q= +sigs.k8s.io/cluster-api/test v1.10.0-rc.1/go.mod h1:CYFajf4HhV5zhoiPl+m5Omk0a3WtnyXHtFVPqWIcUy4= sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=