Skip to content

Commit

Permalink
chore: prepare main branch for v0.12 development
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Salas <[email protected]>
  • Loading branch information
salasberryfin committed Jan 27, 2025
1 parent a9d4352 commit d3e4437
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions docs/book/src/01_user/01_getting-started.md
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.3--bootstrap rke2:v0.10.0 --control-plane rke2:v0.10.0 --infrastructure docker:v1.9.3
clusterctl init --core cluster-api:v1.9.3--bootstrap rke2:v0.11.0 --control-plane rke2:v0.11.0 --infrastructure docker:v1.9.3
```

Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster).
Expand Down Expand Up @@ -263,4 +263,4 @@ kubectl apply -f rke2-clusterclass-example.yaml

### When using CAPD < v1.6.0 unmodified, Cluster creation is stuck after first node and API is not reachable

If you use `docker` as your infrastructure provider without any modification, Cluster creation will stall after provisioning the first node, and the API will not be available using the LB address. This is caused by Load Balancer configuration used in CAPD which is not compatible with RKE2. Therefore, it is necessary to use our own fork of `v1.3.3` by using a specific clusterctl configuration.
If you use `docker` as your infrastructure provider without any modification, Cluster creation will stall after provisioning the first node, and the API will not be available using the LB address. This is caused by Load Balancer configuration used in CAPD which is not compatible with RKE2. Therefore, it is necessary to use our own fork of `v1.3.3` by using a specific clusterctl configuration.
3 changes: 3 additions & 0 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ releaseSeries:
- major: 0
minor: 11
contract: v1beta1
- major: 0
minor: 12
contract: v1beta1
10 changes: 5 additions & 5 deletions test/e2e/config/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ providers:
- name: rke2-control-plane
type: ControlPlaneProvider
versions:
- name: "v0.10.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.10.0/control-plane-components.yaml"
- name: "v0.11.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.11.0/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -76,7 +76,7 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: "--leader-elect"
new: "--leader-elect=false"
- name: v0.11.99 # next; use manifest from source files
- name: v0.12.99 # next; use manifest from source files
value: "../../../controlplane/config/default"
contract: v1beta1
files:
Expand All @@ -90,8 +90,8 @@ providers:
- name: rke2-bootstrap
type: BootstrapProvider
versions:
- name: "v0.10.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.10.0/bootstrap-components.yaml"
- name: "v0.11.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.11.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
InfrastructureProviders: config.InfrastructureProviders(),
IPAMProviders: config.IPAMProviders(),
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
BootstrapProviders: []string{"rke2-bootstrap:v0.10.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.10.0"},
BootstrapProviders: []string{"rke2-bootstrap:v0.11.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.11.0"},
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
DisableMetricsCollection: true,
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ var _ = Describe("Workload cluster creation", func() {
})

Context("Creating a single control-plane cluster", func() {
It("Should create a cluster with v0.10.0 and perform upgrade to latest version", func() {
By("Installing v0.10.0 boostrap/controlplane provider version")
It("Should create a cluster with v0.11.0 and perform upgrade to latest version", func() {
By("Installing v0.11.0 boostrap/controlplane provider version")
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)

By("Initializing the cluster")
Expand Down

0 comments on commit d3e4437

Please sign in to comment.