From 99b1d64f4e0cfcc8e496ff720d07cfcb636dd7e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:36:59 +0000 Subject: [PATCH 1/2] chore(deps): Bump sigs.k8s.io/cluster-api/test from 1.9.1 to 1.9.3 Bumps [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) from 1.9.1 to 1.9.3. - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](https://github.com/kubernetes-sigs/cluster-api/compare/v1.9.1...v1.9.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/cluster-api/test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: Furkat Gofurov --- docs/book/src/01_user/01_getting-started.md | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- test/e2e/config/e2e_conf.yaml | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/book/src/01_user/01_getting-started.md b/docs/book/src/01_user/01_getting-started.md index 77548ece..b3004ade 100644 --- a/docs/book/src/01_user/01_getting-started.md +++ b/docs/book/src/01_user/01_getting-started.md @@ -53,7 +53,7 @@ To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'. No additional steps are required and you can install the RKE2 provider with **clusterctl** directly: ```bash -clusterctl init --core cluster-api:v1.9.0--bootstrap rke2:v0.10.0 --control-plane rke2:v0.10.0 --infrastructure docker:v1.9.0 +clusterctl init --core cluster-api:v1.9.3--bootstrap rke2:v0.10.0 --control-plane rke2:v0.10.0 --infrastructure docker:v1.9.3 ``` Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster). diff --git a/go.mod b/go.mod index 9d965d69..542a8163 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( k8s.io/client-go v0.31.3 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/cluster-api v1.9.0 - sigs.k8s.io/cluster-api/test v1.9.1 + sigs.k8s.io/cluster-api v1.9.3 + sigs.k8s.io/cluster-api/test v1.9.3 sigs.k8s.io/controller-runtime v0.19.3 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index eed57be0..bd703166 100644 --- a/go.sum +++ b/go.sum @@ -439,10 +439,10 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.9.0 h1:Iud4Zj8R/t7QX5Rvs9/V+R8HDLbf7QPVemrWfZi4g54= -sigs.k8s.io/cluster-api v1.9.0/go.mod h1:8rjpkMxLFcA87Y3P6NOi6E9RMZv2uRnN9ppOPAxrTAY= -sigs.k8s.io/cluster-api/test v1.9.1 h1:tn0MRukDZBMaTaWyeyY7FkLwboRhNXt779bAl60qbbc= -sigs.k8s.io/cluster-api/test v1.9.1/go.mod h1:shOK/Hh6ctbMSsw7KUQZt27dwBs9tUE2mFhVKv2WPxk= +sigs.k8s.io/cluster-api v1.9.3 h1:lKWbrXzyNmJh++IcX54ZbAmnO7tZ2wKgds7WvskpiXY= +sigs.k8s.io/cluster-api v1.9.3/go.mod h1:5iojv38PSvOd4cxqu08Un5TQmy2yBkd3+0U7R/e+msk= +sigs.k8s.io/cluster-api/test v1.9.3 h1:65w87EX4X+W+jJ1MkSh+DOTK+T9Di4yS+eMjtCKq9+8= +sigs.k8s.io/cluster-api/test v1.9.3/go.mod h1:RbMw6WR4vwqzu9tx13MmRsnIR+WLQ6xx8BMFtvPYUOY= sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index 7644f26e..833cdf9d 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -16,8 +16,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: "v1.9.0" - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/core-components.yaml" + - name: "v1.9.3" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.3/core-components.yaml" type: "url" contract: v1beta1 files: @@ -30,8 +30,8 @@ providers: - name: docker type: InfrastructureProvider versions: - - name: "v1.9.0" - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/infrastructure-components-development.yaml" + - name: "v1.9.3" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.3/infrastructure-components-development.yaml" type: "url" contract: v1beta1 files: @@ -47,8 +47,8 @@ providers: - name: docker-updated type: InfrastructureProvider versions: - - name: "v1.9.0" - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0/infrastructure-components-development.yaml" + - name: "v1.9.3" + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.3/infrastructure-components-development.yaml" type: "url" contract: v1beta1 files: From 3a6b06e628f987124b55add39b8ae2f42638901b Mon Sep 17 00:00:00 2001 From: Furkat Gofurov Date: Tue, 21 Jan 2025 15:32:06 +0200 Subject: [PATCH 2/2] Fix linter errors Signed-off-by: Furkat Gofurov --- pkg/rke2/control_plane.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rke2/control_plane.go b/pkg/rke2/control_plane.go index 1f03a8cf..e80e21d4 100644 --- a/pkg/rke2/control_plane.go +++ b/pkg/rke2/control_plane.go @@ -181,7 +181,7 @@ func (c *ControlPlane) NextFailureDomainForScaleUp(ctx context.Context) *string return nil } - return capifd.PickFewest(ctx, c.FailureDomains().FilterControlPlane(), c.UpToDateMachines()) + return capifd.PickFewest(ctx, c.FailureDomains().FilterControlPlane(), c.Machines, c.UpToDateMachines()) } // InitialControlPlaneConfig returns a new RKE2ConfigSpec that is to be used for an initializing control plane.