Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump sigs.k8s.io/cluster-api/test from 1.9.1 to 1.9.3 #539

Merged
merged 2 commits into from
Jan 21, 2025
Merged

chore(deps): Bump sigs.k8s.io/cluster-api/test from 1.9.1 to 1.9.3 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b1d64
chore(deps): Bump sigs.k8s.io/cluster-api/test from 1.9.1 to 1.9.3
dependabot[bot] Jan 8, 2025
3a6b06e
Fix linter errors
furkatgofurov7 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/book/src/01_user/01_getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion pkg/rke2/control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
Loading