Skip to content

Commit

Permalink
Merge pull request #506 from alexander-demicev/preparev010
Browse files Browse the repository at this point in the history
Prepare main branch for v0.9 development
  • Loading branch information
Danil-Grigorev authored Nov 28, 2024
2 parents 75b3d07 + 66f2739 commit fced99c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion 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.8.5 --bootstrap rke2:v0.8.0 --control-plane rke2:v0.8.0 --infrastructure docker:v1.8.5
clusterctl init --core cluster-api:v1.8.5 --bootstrap rke2:v0.9.0 --control-plane rke2:v0.9.0 --infrastructure docker:v1.8.5
```

Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster).
Expand Down
3 changes: 3 additions & 0 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ releaseSeries:
- major: 0
minor: 9
contract: v1beta1
- major: 0
minor: 10
contract: v1beta1
12 changes: 6 additions & 6 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.8.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.8.0/control-plane-components.yaml"
- name: "v0.9.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.9.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.9.99 # next; use manifest from source files
- name: v0.10.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.8.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.8.0/bootstrap-components.yaml"
- name: "v0.9.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.9.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -102,7 +102,7 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: "--leader-elect"
new: "--leader-elect=false"
- name: v0.9.99 # next; use manifest from source files
- name: v0.10.99 # next; use manifest from source files
value: ../../../bootstrap/config/default
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.8.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.8.0"},
BootstrapProviders: []string{"rke2-bootstrap:v0.9.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.9.0"},
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
DisableMetricsCollection: true,
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
Expand Down
8 changes: 4 additions & 4 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.8.0 and perform upgrade to latest version", func() {
By("Installing v0.8.0 boostrap/controlplane provider version")
It("Should create a cluster with v0.9.0 and perform upgrade to latest version", func() {
By("Installing v0.9.0 boostrap/controlplane provider version")
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)

By("Initializing the cluster")
Expand Down Expand Up @@ -118,8 +118,8 @@ var _ = Describe("Workload cluster creation", func() {
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
ClusterProxy: bootstrapClusterProxy,
ClusterctlConfigPath: clusterctlConfigPath,
BootstrapProviders: []string{"rke2-bootstrap:v0.9.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.9.99"},
BootstrapProviders: []string{"rke2-bootstrap:v0.10.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.10.99"},
LogFolder: clusterctlLogFolder,
})

Expand Down

0 comments on commit fced99c

Please sign in to comment.