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

Jump to bottom

🌱 Prepare main branch for v0.8 development #447

Merged
merged 1 commit into from
Sep 24, 2024
Merged

🌱 Prepare main branch for v0.8 development #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ releaseSeries:
- major: 0
minor: 7
contract: v1beta1
- major: 0
minor: 8
contract: v1beta1
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 @@ -64,8 +64,8 @@ providers:
- name: rke2-control-plane
type: ControlPlaneProvider
versions:
- name: "v0.6.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/control-plane-components.yaml"
- name: "v0.7.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.7.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.7.99
- name: v0.8.99
value: "../../../controlplane/config/default"
contract: v1beta1
files:
Expand All @@ -90,8 +90,8 @@ providers:
- name: rke2-bootstrap
type: BootstrapProvider
versions:
- name: "v0.6.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/bootstrap-components.yaml"
- name: "v0.7.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.7.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.7.99
- name: v0.8.99 # next; use manifest from source files
value: ../../../bootstrap/config/default
contract: v1beta1
files:
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ func initBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
}

// initUpgradableBootstrapCluster initializes a bootstrap cluster with the latest minor version N-1 and used to perform an upgrade to the latest version.
// Make sure to update the version in the providers list to the latest minor version N-1.
// initUpgradableBootstrapCluster initializes a bootstrap cluster with the latest minor version and used to perform an upgrade to the next version.
// Make sure to update the version in the providers list to the latest minor version.
func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *clusterctl.E2EConfig, clusterctlConfig, artifactFolder string) {
InitManagementCluster(context.TODO(), clusterctl.InitManagementClusterAndWatchControllerLogsInput{
ClusterProxy: bootstrapClusterProxy,
ClusterctlConfigPath: clusterctlConfig,
InfrastructureProviders: config.InfrastructureProviders(),
IPAMProviders: config.IPAMProviders(),
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
BootstrapProviders: []string{"rke2-bootstrap:v0.6.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.6.0"},
BootstrapProviders: []string{"rke2-bootstrap:v0.7.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.7.0"},
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
DisableMetricsCollection: true,
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/e2e_upgrade_test.go
View file
Open in desktop
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.6.0 and perform upgrade to latest version", func() {
By("Installing v0.6.0 boostrap/controlplane provider version")
It("Should create a cluster with v0.7.0 and perform upgrade to latest version", func() {
By("Installing v0.7.0 boostrap/controlplane provider version")
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)

By("Initializing the cluster")
Expand Down Expand Up @@ -114,12 +114,12 @@ var _ = Describe("Workload cluster creation", func() {
ControlPlane: client.ObjectKeyFromObject(result.ControlPlane),
}, e2eConfig.GetIntervals(specName, "wait-control-plane")...)

By("Upgrading to latest boostrap/controlplane provider version")
By("Upgrading to next boostrap/controlplane provider version")
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
ClusterProxy: bootstrapClusterProxy,
ClusterctlConfigPath: clusterctlConfigPath,
BootstrapProviders: []string{"rke2-bootstrap:v0.7.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.7.99"},
BootstrapProviders: []string{"rke2-bootstrap:v0.8.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.8.99"},
LogFolder: clusterctlLogFolder,
})

Expand Down